From daa470c9a8f43354002b053cdeba09d746af0f5f Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Tue, 13 Jun 2017 04:50:11 +0000
Subject: [PATCH] Bug 14715: [QA Follow up] Fixing qa-tools issues

and merge conflicts

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Cab Vinton <bibliwho@gmail.com>

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
---
 .../intranet-tmpl/prog/en/modules/catalogue/results.tt     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index ecd20b8..d161697 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -17,11 +17,11 @@
 [% ELSE %]
     [% SET DetailPage="detail.pl" %]
 [% END %]
+<<<<<<< HEAD
 [% INCLUDE 'doc-head-open.inc' %]
 
 <title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-});
 </head>
 
 <body id="catalog_results" class="catalog">
@@ -82,12 +82,12 @@
                 <!-- RESULTS_PER_PAGE START -->
                     <label for="results_per_page">Results per page: </label>
                     <select id="results_per_page" name="results_per_page">
-                        <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
-                        <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
-                        <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
-                        <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
-                        <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
-                        <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
+                        [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
+                        [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
+                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
+                        [% IF results_per_page == '80' %]<option value="80" selected="selected">80</option>[% ELSE %]<option value="80">80</option>[% END %]
+                        [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
+                        [% IF results_per_page == 'all' %]<option value="all" selected="selected">all</option>[% ELSE %]<option value="all">all</option>[% END %]
                     </select>
                 <!-- RESULTS_PER_PAGE END -->
                     <input type="submit" value="Go" />
-- 
2.1.4