From c2d2e915c930227ff842b699e6bc1673ef5a809a Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 16 Aug 2017 22:38:57 +0200
Subject: [PATCH] Bug 18539 - Follow-up - RMaint missed a merge marker...

---
 t/db_dependent/Koha/Objects.t | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/t/db_dependent/Koha/Objects.t b/t/db_dependent/Koha/Objects.t
index bb1fae6625..216965b14a 100644
--- a/t/db_dependent/Koha/Objects.t
+++ b/t/db_dependent/Koha/Objects.t
@@ -19,11 +19,7 @@
 
 use Modern::Perl;
 
-<<<<<<< HEAD
-use Test::More tests => 10;
-=======
-use Test::More tests => 14;
->>>>>>> 5a26041... Bug 18539: Forbid list context calls for Koha::Objects->find
+use Test::More tests => 11;
 use Test::Warn;
 
 use Koha::Authority::Types;
-- 
2.39.5