@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ a/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' %]