Permalink
Browse files

Merged settings files in Sublime 2174

  • Loading branch information...
1 parent 008aa1b commit 1372a9a9d5140e558425d2f5468bfd3246c728ed @johnburnett committed Feb 2, 2012
Showing with 11 additions and 18 deletions.
  1. +0 −11 Base File.sublime-settings
  2. +0 −7 Global.sublime-settings
  3. +11 −0 Preferences.sublime-settings
@@ -1,11 +0,0 @@
-// Settings in here override those in "Default/Base File.sublime-settings", and
-// are overridden in turn by file type specific settings. Place your settings
-// here, to ensure they're preserved when upgrading.
-{
- "color_scheme": "Packages/User/johnburnett.tmTheme",
- "draw_minimap_border": true,
- "ensure_newline_at_eof_on_save": true,
- "highlight_line": true,
- "word_wrap": false,
- "match_selection": false
-}
@@ -1,7 +0,0 @@
-// Place user-specific overrides in this file, to ensure they're preserved
-// when upgrading
-{
- "theme": "Soda Light.sublime-theme",
- "scroll_speed": 0.0,
- "highlight_modified_tabs": true
-}
@@ -0,0 +1,11 @@
+{
+ "color_scheme": "Packages/User/johnburnett.tmTheme",
+ "draw_minimap_border": true,
+ "ensure_newline_at_eof_on_save": true,
+ "highlight_line": true,
+ "highlight_modified_tabs": true,
+ "match_selection": false,
+ "scroll_speed": 0.0,
+ "theme": "Soda Light.sublime-theme",
+ "word_wrap": false
+}

0 comments on commit 1372a9a

Please sign in to comment.