https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21958 Didier Gautheron <didier.gautheron@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |didier.gautheron@biblibre.c | |om Status|Needs Signoff |Patch doesn't apply --- Comment #13 from Didier Gautheron <didier.gautheron@biblibre.com> --- Trivial but: diff --cc t/db_dependent/AuthoritiesMarc.t index 50bbd6edb4,97f118ccf4..0000000000 --- a/t/db_dependent/AuthoritiesMarc.t +++ b/t/db_dependent/AuthoritiesMarc.t @@@ -5,9 -5,10 +5,14 @@@ use Modern::Perl; ++<<<<<<< HEAD +use Test::More tests => 11; ++======= + use Test::More tests => 10; ++>>>>>>> Bug 21958: Fix bibliographic record field comparison with authority use Test::MockModule; use Test::Warn; + use MARC::Field; use MARC::Record; use t::lib::Mocks; -- You are receiving this mail because: You are watching all bug changes.