--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Thu Jun 05 10:16:05 2014 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Thu Jun 05 10:22:38 2014 +0200
@@ -103,6 +103,9 @@
         # unicode string' exception on Python2
         codestring = normalizeCode(codestring)
         
+        # TODO: check for lines starting with VCS conflict markers
+        #       (7 * c for c in "<>=|") and report as 'error' like syntax check
+        
         if filename.endswith('.ptl'):
             try:
                 import quixote.ptl_compile