From 71f09311a9c3bbd643db6e4b49f371689fac730d Mon Sep 17 00:00:00 2001 From: Ricardo Dias Marques Date: Tue, 20 Oct 2009 00:51:45 +0000 Subject: [PATCH] Fix spurious merge lines in "Labels_split_ddcn.t" Removed spurious merge lines in file "Labels_split_ddcn.t" in 3.0.x branch. --- t/Labels_split_ddcn.t | 4 ---- 1 file changed, 4 deletions(-) diff --git a/t/Labels_split_ddcn.t b/t/Labels_split_ddcn.t index eac8496e45..26aad55c4b 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'); -- 2.20.1