Henning Westerholt writes: > 'git rm pkg/kamailio/gentoo -r' should help to resolve the conflict.
henning, that removed the conflict, although i don't understand how the conflict was possible in the first place, because i have never touched that directory in any branch. -- juha _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
