diff -r 59cf5a66b0b3 -r 041715a2f703 Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 17:40:17 2018 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 18:05:22 2018 +0100
@@ -28,13 +28,13 @@
VcsConflictMarkerRegExpList = (
re.compile(
- r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""",
+ r"""^<<<<<<< .*?\|\|\|\|\|\|\| .*?=======.*?>>>>>>> .*?$""",
re.MULTILINE | re.DOTALL
),
re.compile(
- r"""^<<<<<<< .*?||||||| .*?=======.*?>>>>>>> .*?$""",
+ r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""",
re.MULTILINE | re.DOTALL
- )
+ ),
)
def initService():
