--- 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): """