From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 16 Jun 2010 04:42:14 +0000 (+1200)
Subject: Follow up patch, removing missed conflict marker
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=ac5047b8872768168db3182eca2a1a4fb7de2d5e;p=koha.git

Follow up patch, removing missed conflict marker

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 1dd18843c2..95ce8dd83c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,6 +1,5 @@
     <!-- TMPL_IF NAME="intranetbookbag" --><div id="cartDetails">Your cart is empty.</div><!-- /TMPL_IF -->
 
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
     <div id="header" class="clearfix">
         <div id="toplevelnav">
             <ul id="toplevelmenu">