[Koha-bugs] [Bug 14884] Test failure from Bug 14470

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 --- Comment #2 from Robin Sheat <robin@catalyst.net.nz> --- Created attachment 42830 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42830&action=edit Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.