summaryrefslogtreecommitdiffstats
path: root/kamailio-listtables-html.lsp
diff options
context:
space:
mode:
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 %>