From 8d6cca684e39a3d28f275fcbc4d86dd4af8b7b26 Mon Sep 17 00:00:00 2001
From: McCanna <tmccanna@georgialibraries.org>
Date: Tue, 7 Nov 2017 16:54:12 -0500
Subject: [PATCH] OPAC Customization: Place Hold Screen

Code cleanup in preparation for 3.0 upgrade.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/opac/parts/place_hold.tt2 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 46b44b0ae8..ec1c5a5ad4 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -163,14 +163,9 @@ function toggleActivationDate() {
                         [% IF CGI.param('hold_type') == 'T' AND hdata.record.metarecord AND !hdata.part_required %]
                         <!-- Grab the bre_id so that we can restore it if user accidentally clicks advanced options -->
                            [% bre_id = hdata.target.id %]
-                            <a  id='advanced_hold_link'
-<<<<<<< HEAD
+                            <b><a  id='advanced_hold_link'
                                 href="[% mkurl('', {hold_type => 'M', hold_target => hdata.record.metarecord.id, bre_id => bre_id}) %]">
-                                [% l('Advanced Hold Options') %]</a>
-=======
-                                href="[% mkurl('', {hold_type => 'M', hold_target => hdata.record.metarecord.id}) %]">
-                                <br/><b>[% l('Advanced Hold Options') %]</a></b>
->>>>>>> a25fe69... OPAC UI modifications as per OPAC Working Group suggestions.
+                                <br/>[% l('Advanced Hold Options') %]</a></b>
                         [% END %]
                         [% IF CGI.param('hold_type') == 'M' AND CGI.param('bre_id') %]
                             <input type="hidden" name="bre_id" value="[% CGI.param('bre_id') %]" />
-- 
2.11.0