projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git merge bs
[freeside.git]
/
httemplate
/
search
/
elements
/
search.html
diff --git
a/httemplate/search/elements/search.html
b/httemplate/search/elements/search.html
index
1e9ce5c
..
5762afb
100644
(file)
--- a/
httemplate/search/elements/search.html
+++ b/
httemplate/search/elements/search.html
@@
-33,13
+33,8
@@
Example:
},
# "select * from tablename";
},
# "select * from tablename";
-<<<<<<< HEAD
#required (now even if 'query' is an SQL query string)
#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',
###
'count_query' => 'SELECT COUNT(*) FROM tablename',
###