chore(deps): update dependency webpack-merge to v4.2.1 (#813)

nos · Jan 7, 2019 · bec8efe · bec8efe
1 parent 380a7c9
commit bec8efe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -127,7 +127,7 @@
     "webpack": "3.12.0",
     "webpack-cli": "3.1.2",
     "webpack-dev-server": "2.11.3",
-    "webpack-merge": "4.1.5"
+    "webpack-merge": "4.2.1"
   },
   "build": {
     "appId": "io.nos.desktop",

diff --git a/yarn.lock b/yarn.lock
@@ -12293,10 +12293,10 @@ webpack-dev-server@2.11.3, webpack-dev-server@^2.11.1:
     webpack-dev-middleware "1.12.2"
     yargs "6.6.0"
 
-webpack-merge@4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.5.tgz#2be31e846c20767d1bef56bdca64c328a681190a"
-  integrity sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
   dependencies:
     lodash "^4.17.5"