[Koha-bugs] [Bug 14884] [3.20.X] Test failure from Bug 14470

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #5 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Bug 14884 - [3.20.X] Test failure from Bug 14470 42849 - Bug 14884: remove spurious conflict markers 42850 - Bug 14884: Adjust the number of tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14884: remove spurious conflict markers Applying: Bug 14884: Adjust the number of tests % prove t/db_dependent/Circulation.t t/db_dependent/Circulation.t .. ok All tests successful. Files=1, Tests=63, 4 wallclock secs ( 0.02 usr 0.00 sys + 1.92 cusr 0.04 csys = 1.98 CPU) Result: PASS -- You are receiving this mail because: You are watching all bug changes.