Use lodash.merge instead

Rom325 · Jan 27, 2016 · da3b2c6 · da3b2c6
1 parent 4e39ffe
commit da3b2c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "karma-phantomjs-shim": "^1.0.0",
     "karma-sinon-chai": "^1.0.0",
     "karma-webpack": "^1.7.0",
-    "lodash": "^3.9.3",
+    "lodash.merge": "^4.0.2",
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.2",
     "nodemon": "^1.4.1",

diff --git a/webpack.config.minified.js b/webpack.config.minified.js
@@ -1,7 +1,7 @@
 var webpack = require('webpack');
-var _ = require('lodash');
+var merge = require('lodash.merge');
 
-module.exports = _.merge({}, require('./webpack.config.js'), {
+module.exports = merge({}, require('./webpack.config.js'), {
   output: {
     filename: 'radium.min.js'
   },