http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #42830|0 |1 is obsolete| | --- Comment #3 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 42849 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42849&action=edit Bug 14884: remove spurious conflict markers To test: * Run t/00-merge-conflict-markers.t, ensure it passes Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.