[sr-dev] [kamailio] Merge pull request #459 from kamailio/lazedo/db_text_replace (d0372a1)

[foucse]

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20160104/f7da7dec/attachment-0001.html>