From 0a97cbd4c213acadf3c6bf18b394764144b5d9c9 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Thu, 24 Aug 2017 18:58:25 +1200
Subject: [PATCH] fix merge typo

---
 .../bootstrap/en/includes/opac-detail-sidebar.inc      | 10 ----------
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt      |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index 3e0119a21b..ebc9ccfb33 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -9,16 +9,6 @@
         [% END %]
     [% END %]
     <li><a class="print-large" href="#">Print</a></li>
-<<<<<<< HEAD
-=======
-
-    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-        [% IF Koha.Preference('ArticleRequests') %]
-            <li><a class="article_request" href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblionumber | html %]">Request article</a></li>
-        [% END %]
-    [% END %]
-
->>>>>>> Bug 18726: Fix XSS at the OPAC - biblionumber
     [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
             <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblionumber | html %]">Save to your lists</a></li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 4c744e64d5..93f50b71cd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -943,13 +943,8 @@
 
                                 [% IF ( loggedinusername ) %]
                                     [% UNLESS ( loggedincommenter ) %]
-<<<<<<< HEAD
-                                       <div id="addcomment"> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber %]'); return false;">
-                                            Post or edit your comments on this item.
-=======
                                        <div id="addcomment"> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | html %]'); return false;">
                                             Post your comments on this item.
->>>>>>> Bug 18726: Fix XSS at the OPAC - biblionumber
                                         </a></div>
                                     [% END %]
                                 [% ELSE %]
-- 
2.39.5