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 <[email protected]> Date: Mon Sep 5 21:50:23 2011 +0200 pgk: add symlink to kamailio directory for new gentoo ebuild commit d7b0e82c14caa1809bb6f0d96646354eabf2c253 Author: Henning Westerholt <[email protected]> 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 _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
