diff -r a7b096ecf963 -r d38b38117d83 Documentation/Source/eric6.QScintilla.Editor.html
--- a/Documentation/Source/eric6.QScintilla.Editor.html Sat Feb 03 18:37:36 2018 +0100
+++ b/Documentation/Source/eric6.QScintilla.Editor.html Sat Feb 03 18:41:49 2018 +0100
@@ -138,7 +138,7 @@
QsciScintillaCompat
<h3>Class Attributes</h3>
<table>
-<tr><td>AttributeID</td></tr><tr><td>AttributePrivateID</td></tr><tr><td>AttributeProtectedID</td></tr><tr><td>CancelEditToken</td></tr><tr><td>ClassID</td></tr><tr><td>ClassPrivateID</td></tr><tr><td>ClassProtectedID</td></tr><tr><td>EndEditToken</td></tr><tr><td>EnumID</td></tr><tr><td>FromDocumentID</td></tr><tr><td>KeywordsID</td></tr><tr><td>MethodID</td></tr><tr><td>MethodPrivateID</td></tr><tr><td>MethodProtectedID</td></tr><tr><td>ModuleID</td></tr><tr><td>RequestSyncToken</td></tr><tr><td>Separator</td></tr><tr><td>StartEditToken</td></tr><tr><td>SyncToken</td></tr><tr><td>TemplateImageID</td></tr><tr><td>WarningCode</td></tr><tr><td>WarningStyle</td></tr>
+<tr><td>AttributeID</td></tr><tr><td>AttributePrivateID</td></tr><tr><td>AttributeProtectedID</td></tr><tr><td>CancelEditToken</td></tr><tr><td>ClassID</td></tr><tr><td>ClassPrivateID</td></tr><tr><td>ClassProtectedID</td></tr><tr><td>EndEditToken</td></tr><tr><td>EnumID</td></tr><tr><td>FromDocumentID</td></tr><tr><td>KeywordsID</td></tr><tr><td>MethodID</td></tr><tr><td>MethodPrivateID</td></tr><tr><td>MethodProtectedID</td></tr><tr><td>ModuleID</td></tr><tr><td>RequestSyncToken</td></tr><tr><td>Separator</td></tr><tr><td>StartEditToken</td></tr><tr><td>SyncToken</td></tr><tr><td>TemplateImageID</td></tr><tr><td>VcsConflictMarkerLineRegExpList</td></tr><tr><td>WarningCode</td></tr><tr><td>WarningStyle</td></tr>
</table>
<h3>Class Methods</h3>
<table>
@@ -888,6 +888,9 @@
<td><a href="#Editor.getTaskLines">getTaskLines</a></td>
<td>Public method to get the lines containing a task.</td>
</tr><tr>
+<td><a href="#Editor.getVcsConflictMarkerLines">getVcsConflictMarkerLines</a></td>
+<td>Public method to determine the lines containing a VCS conflict marker.</td>
+</tr><tr>
<td><a href="#Editor.getWarningLines">getWarningLines</a></td>
<td>Public method to get the lines containing a warning.</td>
</tr><tr>
@@ -3602,6 +3605,21 @@
<dd>
list of lines containing a task (list of integer)
</dd>
+</dl><a NAME="Editor.getVcsConflictMarkerLines" ID="Editor.getVcsConflictMarkerLines"></a>
+<h4>Editor.getVcsConflictMarkerLines</h4>
+<b>getVcsConflictMarkerLines</b>(<i></i>)
+<p>
+ Public method to determine the lines containing a VCS conflict marker.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list of line numbers containg a VCS conflict marker
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of int
+</dd>
</dl><a NAME="Editor.getWarningLines" ID="Editor.getWarningLines"></a>
<h4>Editor.getWarningLines</h4>
<b>getWarningLines</b>(<i></i>)
