Mercurial Repositories > eric / file comparison
comparison: Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
- changeset 6108
- 59cf5a66b0b3
- parent 6107
- 78dabf542c6b
- child 6109
- 041715a2f703
equal
deleted
inserted
replaced
| 6107:78dabf542c6b | 6108:59cf5a66b0b3 |
|---|---|
| 30 re.compile( | 30 re.compile( |
| 31 r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", | 31 r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", |
| 32 re.MULTILINE | re.DOTALL | 32 re.MULTILINE | re.DOTALL |
| 33 ), | 33 ), |
| 34 re.compile( | 34 re.compile( |
| 35 r"""^<<<<<<< .*?||||||| .?=======.*?>>>>>>> .*?$""", | 35 r"""^<<<<<<< .*?||||||| .*?=======.*?>>>>>>> .*?$""", |
| 36 re.MULTILINE | re.DOTALL | 36 re.MULTILINE | re.DOTALL |
| 37 ) | 37 ) |
| 38 ) | 38 ) |
| 39 | 39 |
| 40 def initService(): | 40 def initService(): |
