[sr-dev] problem with tracking master

[Juha Heinanen]

Juha Heinanen writes:

> is this conflict due to some git push done to master recently:

looks like the conflict is this:

$ eg log --merge
commit a89e2b1a2f71c932f38c0bfdcceb2fa1880431f5
Author: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Mon Sep 5 21:50:23 2011 +0200

    pgk: add symlink to kamailio directory for new gentoo ebuild

commit d7b0e82c14caa1809bb6f0d96646354eabf2c253
Author: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Mon Sep 5 18:17:40 2011 +0200

    pkg: remove obselete gentoo ebuild, add new generic ebuild from Claudio Fur

henning, is there anything you can do about it?

-- juha