-
Type:
Bug
-
Resolution: Fixed
-
Priority:
P3
-
Affects Version/s: 9
-
Component/s: deploy
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.