Andrei Pelinescu-Onciul writes: > I've restored it and it should work now.
andrei, yes, thanks, now push to master worked, but when i switched to k branch and did pull, i got new errors: $ eg switch kamailio_3.0 Switched to branch 'kamailio_3.0' Your branch and 'origin/kamailio_3.0' have diverged, and have 1 and 3 different commit(s) each, respectively. $ eg pull [email protected]'s password: Removing pkg/kamailio/debian-etch/patches/00list Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch CONFLICT (directory/file): There is a directory with name pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f Removing pkg/kamailio/debian-lenny/changelog Removing pkg/kamailio/debian-lenny/rules Automatic merge failed; fix conflicts and then commit the result. --juha _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
