From 386725d84b1b747264463b8fe3d244e39357d7c1 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Mon, 12 Jan 2009 16:16:47 -0600
Subject: [PATCH] bug 2908 followup - use "list", not "shelf"

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl | 4 ----
 1 file changed, 4 deletions(-)

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 9a18033c53..2c2cbde2dd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -290,11 +290,7 @@ $.tablesorter.addParser({
           <!-- /TMPL_IF -->
         </form>
       <!-- /TMPL_IF -->&nbsp;
-<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
-      <a href="#" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
-=======
       <a href="#" class="send" onClick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
->>>>>>> b99e65c... bug 2908 followup - use "list", not "shelf":koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
     </td>
 		</tr>
             <!-- /TMPL_LOOP -->
-- 
2.39.5