From 14dc8e248b951add40c6f4715715a7ed0b2c67bc Mon Sep 17 00:00:00 2001
From: Zach LeBar <zach@zachlebar.com>
Date: Mon, 20 Aug 2012 19:01:17 +0000
Subject: Fixed merge conflict in 'kamailio-model.lua'.

---
 kamailio-model.lua | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/kamailio-model.lua b/kamailio-model.lua
index bee2cb8..fb31f30 100644
--- a/kamailio-model.lua
+++ b/kamailio-model.lua
@@ -103,15 +103,9 @@ end
 local listtables = function()
 	local result = {}
 	if DBENGINE == "PGSQL" then
-<<<<<<< HEAD
 		local tab = getselectresponse("SELECT tablename, schemaname FROM pg_tables WHERE tablename !~* 'pg_*' ORDER BY schemaname, tablename ASC")
 		for i,t in ipairs(tab) do
 				result[#result+1] = {schema=t.schemaname, table=t.tablename}
-=======
-		local tab = getselectresponse("SELECT tablename FROM pg_tables WHERE tablename !~* 'pg_*' ORDER BY tablename ASC")
-		for i,t in ipairs(tab) do
-			result[#result+1] = t.tablename
->>>>>>> e19ee215667692e70cb4788dca4151e23aa73b96
 		end
 	else
 		-- untested
-- 
cgit v1.2.3