Fix spurious merge lines in "Labels_split_ddcn.t"
authorRicardo Dias Marques <koha@ricmarques.net>
Tue, 20 Oct 2009 00:51:45 +0000 (00:51 +0000)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Tue, 20 Oct 2009 09:31:52 +0000 (11:31 +0200)
commit71f09311a9c3bbd643db6e4b49f371689fac730d
tree3bdffcf20242e83c47296b5ed8dfd9f88c26aff2
parentca326fd2f6bc9ce7c3944baf42c25ff4fcb7dd88
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