Merge from 3.x: PR #5584

Fixes #5578
spyder-ide · Oct 27, 2017 · a56333c · a56333c
2 parents f696a06 + 9f281f5
commit a56333c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/spyder/config/main.py b/spyder/config/main.py
@@ -597,7 +597,7 @@
               'solarized/light/background':  '#fdf6e3',
               'solarized/light/currentline': '#f5efdB',
               'solarized/light/currentcell': '#eee8d5',
-              'solarized/light/occurence':   '#839496',
+              'solarized/light/occurrence':   '#839496',
               'solarized/light/ctrlclick':   '#d33682',
               'solarized/light/sideareas':   '#eee8d5',
               'solarized/light/matched_p':   '#586e75',
@@ -616,7 +616,7 @@
               'solarized/dark/background':  '#002b36',
               'solarized/dark/currentline': '#083f4d',
               'solarized/dark/currentcell': '#073642',
-              'solarized/dark/occurence':   '#657b83',
+              'solarized/dark/occurrence':   '#657b83',
               'solarized/dark/ctrlclick':   '#d33682',
               'solarized/dark/sideareas':   '#073642',
               'solarized/dark/matched_p':   '#93a1a1',
@@ -643,7 +643,7 @@
 #    or if you want to *rename* options, then you need to do a MAJOR update in
 #    version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '40.3.0'
+CONF_VERSION = '41.0.0'
 
 # Main configuration instance
 try: