Mercurial Repositories > eric / file diff

diff -r a7b096ecf963 -r d38b38117d83 Preferences/ConfigurationPages/EditorStylesPage.py
--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Feb 03 18:37:36 2018 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Feb 03 18:41:49 2018 +0100
@@ -251,6 +251,9 @@
         self.initColour("SearchMarkersMap",
                         self.searchMarkerMapButton,
                         Preferences.getEditorColour)
+        self.initColour("VcsConflictMarkersMap",
+                        self.conflictMarkerMapButton,
+                        Preferences.getEditorColour)
         self.initColour("MarkerMapBackground",
                         self.markerMapBackgroundButton,
                         Preferences.getEditorColour)