Fix spurious merge lines in "Labels_split_ddcn.t"

Removed spurious merge lines in file "Labels_split_ddcn.t"
in 3.0.x branch.
This commit is contained in:
Ricardo Dias Marques 2009-10-20 00:51:45 +00:00 committed by Henri-Damien LAURENT
parent ca326fd2f6
commit 71f09311a9
1 changed files with 0 additions and 4 deletions

View File

@ -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');