From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 20 Apr 2017 03:09:25 +0200
Subject: Reorganize module loading.

We now use webpack instead of SystemJS, effectively bundling modules
into one file (plus commons chunks) for every entry point.  This results
in a much smaller extension size (almost half).  Furthermore we use
yarn/npm even for extension run-time dependencies.  This relieves us
from manually vendoring and building dependencies.  It's also easier to
understand for new developers familiar with node.
---
 node_modules/lodash/defaultsDeep.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'node_modules/lodash/defaultsDeep.js')

diff --git a/node_modules/lodash/defaultsDeep.js b/node_modules/lodash/defaultsDeep.js
index 41680ed2d..9b5fa3ee2 100644
--- a/node_modules/lodash/defaultsDeep.js
+++ b/node_modules/lodash/defaultsDeep.js
@@ -1,6 +1,6 @@
 var apply = require('./_apply'),
     baseRest = require('./_baseRest'),
-    mergeDefaults = require('./_mergeDefaults'),
+    customDefaultsMerge = require('./_customDefaultsMerge'),
     mergeWith = require('./mergeWith');
 
 /**
@@ -23,7 +23,7 @@ var apply = require('./_apply'),
  * // => { 'a': { 'b': 2, 'c': 3 } }
  */
 var defaultsDeep = baseRest(function(args) {
-  args.push(undefined, mergeDefaults);
+  args.push(undefined, customDefaultsMerge);
   return apply(mergeWith, undefined, args);
 });
 
-- 
cgit v1.2.3