458:
<<'CONFIGFILE_BUG1225189'; [....code...] CONFIGFILE_BUG1225189
888:
<<'CONFIGFILE_BUG1225189'; [...code...] CONFIGFILE_BUG1225189
Not a merge conflict is it?
458:
<<'CONFIGFILE_ BUG1225189' ; BUG1225189
[....code...]
CONFIGFILE_
888:
<<'CONFIGFILE_ BUG1225189' ; BUG1225189
[...code...]
CONFIGFILE_
Not a merge conflict is it?