From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Fri, 6 Nov 2009 16:31:28 +0000 (+0100)
Subject: Fixing Merge on shelves Adding Print and send List
X-Git-Tag: v3.02.00-alpha~54^2~89
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=46b30f4b0fc4bdc7b3f530d2f055522c694523c0;p=koha.git

Fixing Merge on shelves Adding Print and send List
---

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 6afd64aa69..1741d64f88 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -194,13 +194,10 @@ $(function() {
                          <input type="hidden" value="1" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->"/>
                          <input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));"/>
                       </form>
-<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
-=======
 
 		      <a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print</a>
 
                       <a href="#" class="send tag_hides" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelfnumber" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
->>>>>>> cefbb72... Ticket 1110 : Balance carts and lists:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
 <!-- TMPL_IF NAME="RequestOnOpac" -->
                       <span id="placehold"></span>
 <!-- /TMPL_IF -->