diff -r a7b096ecf963 -r d38b38117d83 APIs/Python3/eric6.api
--- a/APIs/Python3/eric6.api Sat Feb 03 18:37:36 2018 +0100
+++ b/APIs/Python3/eric6.api Sat Feb 03 18:41:49 2018 +0100
@@ -4203,7 +4203,7 @@
eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations._messages?8
eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations._messages_sample_args?8
eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations.getTranslatedMessage?4(message)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.VcsConflictMarkerRe?7
+eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.VcsConflictMarkerRegExpList?7
eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.extractLineFlags?4(line, startComment=")
eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initBatchService?4()
eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initService?4()
@@ -8189,6 +8189,7 @@
eric6.QScintilla.Editor.Editor.StartEditToken?7
eric6.QScintilla.Editor.Editor.SyncToken?7
eric6.QScintilla.Editor.Editor.TemplateImageID?7
+eric6.QScintilla.Editor.Editor.VcsConflictMarkerLineRegExpList?7
eric6.QScintilla.Editor.Editor.WarningCode?7
eric6.QScintilla.Editor.Editor.WarningStyle?7
eric6.QScintilla.Editor.Editor.addCallTipHook?4(key, func)
@@ -8283,6 +8284,7 @@
eric6.QScintilla.Editor.Editor.getSyntaxErrorLines?4()
eric6.QScintilla.Editor.Editor.getSyntaxErrors?4()
eric6.QScintilla.Editor.Editor.getTaskLines?4()
+eric6.QScintilla.Editor.Editor.getVcsConflictMarkerLines?4()
eric6.QScintilla.Editor.Editor.getWarningLines?4()
eric6.QScintilla.Editor.Editor.getWarnings?4()
eric6.QScintilla.Editor.Editor.getWord?4(line, index, direction=0, useWordChars=True)
