From b278990fcae28c2f2c09a66ed8f388ac0fa478f8 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 27 Nov 2017 12:18:37 -0800
Subject: git merge bs

---
 httemplate/search/elements/search.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 1e9ce5cde..5762afbe5 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -33,13 +33,8 @@ Example:
 
                      },
                      # "select * from tablename";
-<<<<<<< HEAD
    
     #required (now even if 'query' is an SQL query string)
-=======
-
-    #required unless 'query' is an SQL query string (shouldn't be...)
->>>>>>> 95144265eeb3ecd13b16708dbdd75dd3701f92ad
     'count_query' => 'SELECT COUNT(*) FROM tablename',
 
     ###
-- 
cgit v1.2.1