Conflicts !
Auto-merging modules/presence/notify.c
CONFLICT (add/add): Merge conflict in modules/presence/notify.c
Auto-merging modules/db_text/dbtext.h
CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.h
Auto-merging modules/db_text/dbtext.c
CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.c
Auto-merging modules/db_text/dbt_base.c
CONFLICT (add/add): Merge conflict in modules/db_text/dbt_base.c
Automatic merge failed; fix conflicts and then commit the result.
---
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe56922bbceece2#commitcomment-15240185
_______________________________________________
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
