http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9977 Bug ID: 9977 Summary: OMNIBUS, remove accidental 'merge marker' strings from Koha Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: gmcharlt@gmail.com Reporter: mtj@kohaaloha.com some files have accidental merge marker strings in them ie: '<<<<<<<<<<<<<<', '>>>>>>>>>>>>>>>>' and '================' we should remove these lines, to increase our ability to detect actual merge errors -- You are receiving this mail because: You are watching all bug changes.