From b747677d252d255f1505ef222b123716b1bad3d8 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chris@bigballofwax.co.nz>
Date: Wed, 9 Sep 2009 09:34:53 +1200
Subject: [PATCH] Cleanup after conflicted merge

---
 .../opac-tmpl/prog/en/modules/opac-results.tmpl  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 027e67f75c..3d572d30c0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -475,23 +475,7 @@ $("span.addto").html(param1);
 				<!-- TMPL_IF Name="searchhighlightblob" --><span class="results_summary"><span class="label">Match:</span> <!-- TMPL_VAR NAME="searchhighlightblob" --></span><!-- /TMPL_IF -->
 
 <span class="results_summary actions"><span class="label">Actions:</span>
-<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
-                                <!-- TMPL_IF name="RequestOnOpac" -->
-					<!-- TMPL_UNLESS NAME="norequests" -->
-						<!-- TMPL_IF NAME="opacuserlogin" -->
-							<!-- TMPL_IF NAME="AllowOnShelfHolds" -->
-								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- add back when available 0 holds in queue-->
-							<!-- TMPL_ELSE -->
-								<!-- TMPL_IF NAME="itemsissued" -->
-									<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- add back when available 0 holds in queue-->
-								<!-- /TMPL_IF -->
-							<!-- /TMPL_IF -->
-						<!-- /TMPL_IF -->
-					<!-- /TMPL_UNLESS -->
-				<!-- /TMPL_IF -->
-=======
                                 <!-- TMPL_IF name="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- add back when available 0 holds in queue--> <!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
->>>>>>> 3fa269d... Bug 3173 Place Hold link visible in OPAC even if syspref turned off:koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
 
 
 				<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="virtualshelves" --><a class="addtolist" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Save to Lists</a>
-- 
2.39.5