From 4c1643c62294d6caeb0615d0f4d8a973d16cc866 Mon Sep 17 00:00:00 2001 From: Robin Sheat 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 --- 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 bb453ea..431bf33 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.1.4