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

[Liviu Chircu]

  Branch: refs/heads/1.10
  Home:   https://github.com/OpenSIPS/opensips
  Commit: 23ea1643bf1227e1db4450bc378e3fbc849c7791
      https://github.com/OpenSIPS/opensips/commit/23ea1643bf1227e1db4450bc378e3fbc849c7791
  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)
(cherry picked from commit b0deb69be94633472681eb91dddb3b63f0be8bd5)