Mercurial Repositories > eric / file diff

diff -r 0c976706e8c1 -r bace7fb85a01 changelog
--- a/changelog	Sun Feb 04 10:56:30 2018 +0100
+++ b/changelog	Fri Mar 02 19:35:16 2018 +0100
@@ -1,5 +1,11 @@
 Change Log
 ----------
+Version 18.03:
+- bug fixes
+- Editor
+  -- added support for EditorConfig
+  -- added VCS conflict markers to the types shown on the marker map
+
 Version 18.02:
 - bug fixes
 - General