Merge pull request #110 from dignifiedquire/greenkeeper/webpack-merge…

…-4.0.0 fix(package): update webpack-merge to version 4.0.0
ipfs · Mar 8, 2017 · b0898f4 · b0898f4
2 parents b8d2df1 + 34ae02c
commit b0898f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
     "transform-loader": "^0.2.3",
     "uglify-js": "github:mishoo/UglifyJS2#harmony",
     "webpack": "^2.1.0-beta.28",
-    "webpack-merge": "^2.5.0"
+    "webpack-merge": "^4.0.0"
   },
   "repository": {
     "type": "git",