From 4d1ae6e14c667515462ef19ddcd63520953f3416 Mon Sep 17 00:00:00 2001
From: "Cody B. Daig" <cody@daig.me>
Date: Sun, 19 Jul 2015 15:35:47 -0700
Subject: [PATCH] change _.extend to _.merge

---
 config/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.js b/config/config.js
index 943be98be5..756c08881e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -147,7 +147,7 @@ var initGlobalConfig = function() {
 	var environmentAssets = require(path.join(process.cwd(), 'config/assets/', process.env.NODE_ENV)) || {};
 
 	// Merge assets
-	var assets = _.extend(defaultAssets, environmentAssets);
+	var assets = _.merge(defaultAssets, environmentAssets);
 
     // Get the default config
     var defaultConfig = require(path.join(process.cwd(), 'config/env/default'));
@@ -156,7 +156,7 @@ var initGlobalConfig = function() {
     var environmentConfig = require(path.join(process.cwd(), 'config/env/', process.env.NODE_ENV)) || {};
 
     // Merge config files
-    var envConf = _.extend(defaultConfig, environmentConfig);
+    var envConf = _.merge(defaultConfig, environmentConfig);
 
    var config = _.merge(envConf, (fs.existsSync(path.join(process.cwd(), 'config/env/local.js')) && require(path.join(process.cwd(), 'config/env/local.js'))) || {});