Mercurial Repositories > eric / file diff

--- a/Documentation/Help/source.qhp	Sat Feb 03 18:37:36 2018 +0100
+++ b/Documentation/Help/source.qhp	Sat Feb 03 18:41:49 2018 +0100
@@ -5383,6 +5383,7 @@
       <keyword name="Editor.getSyntaxErrorLines" id="Editor.getSyntaxErrorLines" ref="eric6.QScintilla.Editor.html#Editor.getSyntaxErrorLines" />
       <keyword name="Editor.getSyntaxErrors" id="Editor.getSyntaxErrors" ref="eric6.QScintilla.Editor.html#Editor.getSyntaxErrors" />
       <keyword name="Editor.getTaskLines" id="Editor.getTaskLines" ref="eric6.QScintilla.Editor.html#Editor.getTaskLines" />
+      <keyword name="Editor.getVcsConflictMarkerLines" id="Editor.getVcsConflictMarkerLines" ref="eric6.QScintilla.Editor.html#Editor.getVcsConflictMarkerLines" />
       <keyword name="Editor.getWarningLines" id="Editor.getWarningLines" ref="eric6.QScintilla.Editor.html#Editor.getWarningLines" />
       <keyword name="Editor.getWarnings" id="Editor.getWarnings" ref="eric6.QScintilla.Editor.html#Editor.getWarnings" />
       <keyword name="Editor.getWord" id="Editor.getWord" ref="eric6.QScintilla.Editor.html#Editor.getWord" />