Mercurial Repositories > eric / changeset
changeset
Fix for the second conflict markers regexp.
Sat, 03 Feb 2018 17:40:17 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 03 Feb 2018 17:40:17 +0100
- changeset 6108
- 59cf5a66b0b3
- parent 6107
- 78dabf542c6b
- child 6109
- 041715a2f703
Fix for the second conflict markers regexp.
| Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 17:34:19 2018 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sat Feb 03 17:40:17 2018 +0100 @@ -32,7 +32,7 @@ re.MULTILINE | re.DOTALL ), re.compile( - r"""^<<<<<<< .*?||||||| .?=======.*?>>>>>>> .*?$""", + r"""^<<<<<<< .*?||||||| .*?=======.*?>>>>>>> .*?$""", re.MULTILINE | re.DOTALL ) )
