<p>Conflicts !</p>

<p>Auto-merging modules/presence/notify.c<br>
CONFLICT (add/add): Merge conflict in modules/presence/notify.c<br>
Auto-merging modules/db_text/dbtext.h<br>
CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.h<br>
Auto-merging modules/db_text/dbtext.c<br>
CONFLICT (add/add): Merge conflict in modules/db_text/dbtext.c<br>
Auto-merging modules/db_text/dbt_base.c<br>
CONFLICT (add/add): Merge conflict in modules/db_text/dbt_base.c<br>
Automatic merge failed; fix conflicts and then commit the result.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe56922bbceece2#commitcomment-15240185">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AF36ZWAY5VbbykGWra9_CKgCF2AuHYAIks5pWkICgaJpZM4G9-lo.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/kamailio/kamailio/commit/d0372a132767cf08dd8786692fe56922bbceece2#commitcomment-15240185"></link>
  <meta itemprop="name" content="View Commit"></meta>
</div>
<meta itemprop="description" content="View this Commit on GitHub"></meta>
</div>