From 3c79cd4a117fccebeb60695c6707be2c521970fa Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 Signed-off-by: Cab Vinton Signed-off-by: Liz Rea --- .../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 7e014db1b1..2e03d440c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -17,10 +17,10 @@ [% ELSE %] [% SET DetailPage="detail.pl" %] [% END %] +<<<<<<< HEAD [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %] [% INCLUDE 'doc-head-close.inc' %] -}); @@ -81,12 +81,12 @@ -- 2.11.0