Details
-
Bug
-
Resolution: Fixed
-
P3
-
9
Description
A recent changeset has introduced a single ^M at the end of one of the lines. This is causing a cross-branch merge conflict that can be eliminated by fixing it.