diff -r a0c8a7f9839c -r c6e175462586 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:03:40 2015 +0200
@@ -3981,6 +3981,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)
