[OpenSIPS-Devel] [OpenSIPS/opensips] b0deb6: cachedb_sql: properly fix git conflict (from f7d30...

[Liviu Chircu]

  Branch: refs/heads/1.11
  Home:   https://github.com/OpenSIPS/opensips
  Commit: b0deb69be94633472681eb91dddb3b63f0be8bd5
      https://github.com/OpenSIPS/opensips/commit/b0deb69be94633472681eb91dddb3b63f0be8bd5
  Author: Liviu Chircu <liviu at opensips.org>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M modules/cachedb_sql/cachedb_sql.c

  Log Message:
  -----------
  cachedb_sql: properly fix git conflict (from f7d30b6e)