From b63fff5ba4f7ebffb4e40aab4fe014f7fd89c69f Mon Sep 17 00:00:00 2001
From: Chris Cormack <chris@bigballofwax.co.nz>
Date: Tue, 15 Sep 2009 13:55:19 +1200
Subject: [PATCH] Fixing mess leftover from conflict

---
 .../prog/en/modules/catalogue/MARCdetail.tmpl | 73 +------------------
 1 file changed, 1 insertion(+), 72 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 5f794dab59..b7809d46bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -119,15 +119,8 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
+
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -157,15 +150,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -195,15 +180,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -233,15 +210,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -271,15 +240,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -309,15 +270,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -347,15 +300,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -385,15 +330,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -423,15 +360,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></span>
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
-=======
-                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> ebc305b... Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display":koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
-=======
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
->>>>>>> 6133a06... bug 2596: remove URL escaping added by previous patch:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
-- 
2.39.5