Mercurial Repositories > eric / changeset

diff -r af093b61f1cb -r c799d2a8f1bc APIs/Python3/eric6.api
--- a/APIs/Python3/eric6.api	Fri Apr 10 19:16:57 2015 +0200
+++ b/APIs/Python3/eric6.api	Sat Apr 11 14:04:41 2015 +0200
@@ -3960,6 +3960,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.extractLineFlags?4(line, startComment=")
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initService?4()
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.normalizeCode?4(codestring)

diff -r af093b61f1cb -r c799d2a8f1bc Documentation/Help/source.qch
Binary file Documentation/Help/source.qch has changed

diff -r af093b61f1cb -r c799d2a8f1bc Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Fri Apr 10 19:16:57 2015 +0200
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Sat Apr 11 14:04:41 2015 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>VcsConflictMarkerRe</td></tr>
 </table>
 <h3>Classes</h3>
 <table>