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.
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.
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.
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