From 0ca144002666e69ff15962cca0e71cc75bfedfb9 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 20 Dec 2012 21:40:08 -0700
Subject: [PATCH] Oops. Don't overwrite user config w/ defaults before its
 loaded

---
 src/app/config.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/config.coffee b/src/app/config.coffee
index c70c37a06..c437cf010 100644
--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -17,9 +17,9 @@ class Config
   settings: null
 
   constructor: ->
-    @settings = {}
-    @setDefaults "core", require('root-view').configDefaults
-    @setDefaults "editor", require('editor').configDefaults
+    @settings =
+      core: require('root-view').configDefaults
+      editor: require('editor').configDefaults
 
   load: ->
     @loadUserConfig()