gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 18539 - Follow-up - RMaint missed a merge marker...

This commit is contained in:
Katrin Fischer 2017-08-16 22:38:57 +02:00
parent 12d8885eef
commit c2d2e915c9
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/db_dependent/Koha/Objects.t
View File

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