http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14884 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #42849|0 |1 is obsolete| | Attachment #42850|0 |1 is obsolete| | --- Comment #6 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 42912 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42912&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> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.