diff options
| author | Zach LeBar <zach@zachlebar.com> | 2012-08-20 19:01:17 +0000 |
|---|---|---|
| committer | Zach LeBar <zach@zachlebar.com> | 2012-08-20 19:01:17 +0000 |
| commit | 14dc8e248b951add40c6f4715715a7ed0b2c67bc (patch) | |
| tree | cbee837e9c7bb4eb67e1e131032c376d7bfc9a07 | |
| parent | 59d8caa19b5f261006f4e5922aae43976dd415b5 (diff) | |
| download | acf-kamailio-14dc8e248b951add40c6f4715715a7ed0b2c67bc.tar.bz2 acf-kamailio-14dc8e248b951add40c6f4715715a7ed0b2c67bc.tar.xz | |
Fixed merge conflict in 'kamailio-model.lua'.
| -rw-r--r-- | kamailio-model.lua | 6 |
1 files changed, 0 insertions, 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 |