Mercurial Repositories > eric / file diff

diff -r 306373ccf8fd -r 27d21e5163b8 src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py	Wed Apr 10 17:03:56 2024 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py	Wed May 15 10:45:50 2024 +0200
@@ -275,7 +275,7 @@
             for conflictMarkerRe in VcsConflictMarkerRegExpList:
                 conflict = conflictMarkerRe.search(codestring)
                 if conflict is not None:
-                    start, i = conflict.span()
+                    start, _i = conflict.span()
                     lineindex = 1 + codestring.count("\n", 0, start)
                     return [
                         {