summaryrefslogtreecommitdiffstats
path: root/kamailio-listtables-html.lsp
diff options
context:
space:
mode:
authorZach LeBar <zach@zachlebar.com>2012-08-20 19:45:08 +0000
committerZach LeBar <zach@zachlebar.com>2012-08-20 19:45:08 +0000
commit93c1c98eb94b6a5382b5ecd34f4317c2ea14b6d6 (patch)
tree10797e2010478358ff146afdb237cbc9266459bc /kamailio-listtables-html.lsp
parent781f22c23373bc75c2afedab5daa0fefcb1fc4b1 (diff)
downloadacf-kamailio-93c1c98eb94b6a5382b5ecd34f4317c2ea14b6d6.tar.bz2
acf-kamailio-93c1c98eb94b6a5382b5ecd34f4317c2ea14b6d6.tar.xz
Fixed merge conflicts in 'kamailio-listtables-html.lsp'.HEADmaster
Diffstat (limited to 'kamailio-listtables-html.lsp')
-rw-r--r--kamailio-listtables-html.lsp9
1 files changed, 0 insertions, 9 deletions
diff --git a/kamailio-listtables-html.lsp b/kamailio-listtables-html.lsp
index f8bdd33..38dd4f0 100644
--- a/kamailio-listtables-html.lsp
+++ b/kamailio-listtables-html.lsp
@@ -5,7 +5,6 @@
<H1><%= html.html_escape(form.label) %></H1>
<DL>
-<<<<<<< HEAD
<% for i,v in ipairs(form.value) do %>
<li>
<% if viewlibrary.check_permission("viewtable") then %>
@@ -16,14 +15,6 @@
<% end %>
<% else %>
<%= html.html_escape("("..v.schema..") "..v.table) %>
-=======
-<% for i,table in ipairs(form.value) do %>
- <li>
- <% if viewlibrary.check_permission("viewtable") then %>
- <%= html.link{value = "viewtable?table=" .. table, label=table} %>
- <% else %>
- <%= html.html_escape(table) %>
->>>>>>> e19ee215667692e70cb4788dca4151e23aa73b96
<% end %>
<% end %>
<% if #form.value == 0 and viewlibrary.check_permission("createdatabase") then %>