diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-11-27 12:18:37 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-11-27 12:18:37 -0800 |
| commit | b278990fcae28c2f2c09a66ed8f388ac0fa478f8 (patch) | |
| tree | a4159b96974b4ff55b7757678030666557a099ad | |
| parent | d2e3299a0af2b5122d73b9f3ca0814a36919b1da (diff) | |
git merge bs
| -rw-r--r-- | httemplate/search/elements/search.html | 5 |
1 files changed, 0 insertions, 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', ### |