From a9b0a4e307a1f0868937922a870fffc2ca5a4356 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 12 Dec 2020 02:19:03 +0000
Subject: [PATCH] Bump webpack-merge from 5.4.0 to 5.6.1

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.0 to 5.6.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.4.0...v5.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e86d85cdf8..e64fac8b7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8390,9 +8390,9 @@
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
@@ -10964,9 +10964,9 @@
       }
     },
     "webpack-merge": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
-      "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz",
+      "integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index c19e8b2793..f9a0d2384a 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "vue-template-compiler": "^2.6.12",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.2.0",
-    "webpack-merge": "^5.4.0",
+    "webpack-merge": "^5.6.1",
     "webpack-node-externals": "^2.5.2"
   },
   "browserslist": [