[Koha-patches] [PATCH] Follow up patch, removing missed conflict marker

[Chris Cormack]

---
 .../intranet-tmpl/prog/en/includes/header.inc      |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 1dd1884..95ce8dd 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">
-- 
1.6.3.3