[OpenSIPS-Devel] [OpenSIPS/opensips] ac1c4f: Fix git merging errors

[Bogdan-Andrei Iancu]

  Branch: refs/heads/master
  Home:   https://github.com/OpenSIPS/opensips
  Commit: ac1c4ff9a6f258f782fb15fb5bbb15a93b6f5f26
      https://github.com/OpenSIPS/opensips/commit/ac1c4ff9a6f258f782fb15fb5bbb15a93b6f5f26
  Author: Bogdan-Andrei Iancu <bogdan at opensips.org>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M modules/tls_mgm/tls_mgm.c

  Log Message:
  -----------
  Fix git merging errors