From 231657a7cf4ad315a9aff84f4836c305f4cd3055 Mon Sep 17 00:00:00 2001
From: Robin Sheat <robin@catalyst.net.nz>
Date: Thu, 24 Sep 2015 14:20:33 +1200
Subject: [PATCH] Bug 14884: remove spurious conflict markers

To test:
* Run t/00-merge-conflict-markers.t, ensure it passes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 t/db_dependent/Circulation.t | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
index bb453eaf6f..431bf33227 100755
--- a/t/db_dependent/Circulation.t
+++ b/t/db_dependent/Circulation.t
@@ -596,8 +596,6 @@ C4::Context->dbh->do("DELETE FROM accountlines");
 
 $dbh->rollback;
 
-<<<<<<< HEAD
-=======
 {
     # Don't allow renewing onsite checkout
     my $barcode  = 'R00000XXX';
@@ -635,5 +633,4 @@ $dbh->rollback;
 }
 
 $schema->storage->txn_rollback();
->>>>>>> ea92a92... Bug 14470: Do not allow renew for on-site checkouts
 1;
-- 
2.39.5