From 93c1c98eb94b6a5382b5ecd34f4317c2ea14b6d6 Mon Sep 17 00:00:00 2001
From: Zach LeBar <zach@zachlebar.com>
Date: Mon, 20 Aug 2012 19:45:08 +0000
Subject: Fixed merge conflicts in 'kamailio-listtables-html.lsp'.

---
 kamailio-listtables-html.lsp | 9 ---------
 1 file changed, 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 %>
-- 
cgit v1.2.3