Bug 5400

Summary: add test case to detect merge conflict markers in the code
Product: Koha Reporter: Galen Charlton <gmcharlt>
Component: Architecture, internals, and plumbingAssignee: Galen Charlton <gmcharlt>
Status: CLOSED FIXED QA Contact: Bugs List <koha-bugs>
Severity: enhancement    
Priority: P5 - low CC: cnighswonger
Version: unspecified   
Hardware: All   
OS: All   
GIT URL: Change sponsored?: ---
Patch complexity: --- Documentation contact:
Documentation submission: Text to go in the release notes:
Version(s) released in:
Circulation function:

Description Galen Charlton 2010-11-13 14:02:49 UTC
Merge conflict markers don't belong in the code, of course, but occasionally can creep in during a moment of inattention.  A test case can catch them.
Comment 1 Chris Nighswonger 2010-11-18 03:15:39 UTC
This bug has a patch presently committed to HEAD and 3.2.x.

Please take the appropriate action to update the status of this bug.

Remember, bugs which have been resolved should be tested and marked closed, preferably by the original reporter.
Comment 2 Chris Nighswonger 2010-11-30 13:49:42 UTC
This bug has a fix which was committed to the 3.2.x branch and released in 3.2.1.

Please take time to update the status of this bug and mark it RESOLVED FIXED so that it may be closed.
Comment 3 MJ Ray (software.coop) 2010-12-08 10:15:53 UTC
This bug is mentioned in:
bug 5400: new test case to find files with	merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012969.html
bug 5400: new test case to find files with	merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012993.html
bug 5400: new test case to find files with merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012994.html