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

…1.0.1 Update webpack-merge to version 1.0.1 🚀
ipfs · Nov 28, 2016 · 6be89a0 · 6be89a0
2 parents e2fee8b + 1a3c52d
commit 6be89a0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "transform-loader": "^0.2.3",
     "uglify-js": "github:mishoo/UglifyJS2#harmony",
     "webpack": "^2.1.0-beta.26",
-    "webpack-merge": "^0.17.0"
+    "webpack-merge": "^1.0.1"
   },
   "repository": {
     "type": "git",