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

…0.17.0 Update webpack-merge to version 0.17.0 🚀
ipfs · Nov 17, 2016 · e2fee8b · e2fee8b
2 parents 258f82f + 9e9cf84
commit e2fee8b
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.15.0"
+    "webpack-merge": "^0.17.0"
   },
   "repository": {
     "type": "git",