Mercurial Repositories > eric / file diff
diff: Preferences/__init__.py
Preferences/__init__.py
- changeset 6111
- d38b38117d83
- parent 6105
- cbd34d558bd9
- child 6138
- b235f6fe5c9f
diff -r a7b096ecf963 -r d38b38117d83 Preferences/__init__.py --- a/Preferences/__init__.py Sat Feb 03 18:37:36 2018 +0100 +++ b/Preferences/__init__.py Sat Feb 03 18:41:49 2018 +0100 @@ -666,6 +666,7 @@ "ChangesMap": QColor("#00b000"), "CurrentMap": QColor("#000000"), "SearchMarkersMap": QColor(Qt.blue), + "VcsConflictMarkersMap": QColor("#dd00dd"), "MarkerMapBackground": QColor("#e7e7e7"), }
