From 97d1ae33d3d1fb4010f03994b5cc2c8e5be36637 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Fri, 15 Sep 2017 20:23:03 +0200 Subject: [PATCH] Revert #2126 (#2202) --- app/config/init.js | 4 ---- app/package.json | 1 - 2 files changed, 5 deletions(-) diff --git a/app/config/init.js b/app/config/init.js index 8cc446f7..65bbfa02 100644 --- a/app/config/init.js +++ b/app/config/init.js @@ -1,5 +1,4 @@ const vm = require('vm'); -const merge = require('lodash/merge'); const notify = require('../notify'); const _extract = function (script) { @@ -37,9 +36,6 @@ const _init = function (cfg) { return _extractDefault(cfg.defaultCfg); } - // Use options from default config when not specified in user config #1588 - _cfg.config = merge(_extractDefault(cfg.defaultCfg).config, _cfg.config); - // Ignore undefined values in plugin and localPlugins array Issue #1862 _cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || []; _cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || []; diff --git a/app/package.json b/app/package.json index 1374c7b6..4ab1befe 100644 --- a/app/package.json +++ b/app/package.json @@ -19,7 +19,6 @@ "electron-config": "1.0.0", "electron-is-dev": "0.3.0", "electron-squirrel-startup": "1.0.0", - "lodash": "4.17.4", "file-uri-to-path": "1.0.0", "git-describe": "4.0.2", "mkdirp": "0.5.1",