diff -r ffeb85cdc72d -r 441956d8fce5 Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sun Jun 29 14:00:30 2014 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sun Jun 29 20:13:56 2014 +0200
@@ -108,8 +108,9 @@
for line in codestring.splitlines():
if any(line.startswith(c * 7) for c in "<>=|"):
return [{'error':
- (file_enc, lineindex, 0, "", "VCS conflict marker found")
- }]
+ (file_enc, lineindex, 0, "",
+ "VCS conflict marker found")
+ }]
lineindex += 1
if filename.endswith('.ptl'):
