Mercurial Repositories > eric / file diff

diff -r da9e08920e7c -r 18fb5d765f3a QScintilla/Editor.py
--- a/QScintilla/Editor.py	Tue Feb 06 19:18:43 2018 +0100
+++ b/QScintilla/Editor.py	Tue Feb 06 19:21:00 2018 +0100
@@ -152,7 +152,6 @@
         r"""^>>>>>>> .*?$""",
     )
     
-    
     def __init__(self, dbs, fn="", vm=None,
                  filetype="", editor=None, tv=None):
         """