Removed spurious merge lines in file "Labels_split_ddcn.t"
in 3.0.x branch.
---
t/Labels_split_ddcn.t | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/t/Labels_split_ddcn.t b/t/Labels_split_ddcn.t
index eac8496..26aad55 100755
--- a/t/Labels_split_ddcn.t
+++ b/t/Labels_split_ddcn.t
@@ -5,11 +5,7 @@
use strict;
use warnings;
-<<<<<<< HEAD:t/Labels_split_ddcn.t
-use Test::More tests => 62;
-=======
use Test::More tests => 82;
->>>>>>> e72a02e... Bug 2500 Tweaking DDCN Split for Hyphenated Volumn
Numbers:t/Labels_split_ddcn.t
BEGIN {
use_ok('C4::Labels');
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
