From 2364ae35b3fd3cc52231f21226d8bbc40f656d7c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 02:21:44 +0000
Subject: [PATCH] Bump webpack-merge from 5.3.0 to 5.4.0

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.4.0.
- [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.3.0...v5.4.0)

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

diff --git a/package-lock.json b/package-lock.json
index 37e382b1..486b705b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21038,9 +21038,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.3.0.tgz",
-			"integrity": "sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
+			"integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index a4b96e54..5b144cb2 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^4.2.0",
-		"webpack-merge": "^5.3.0"
+		"webpack-merge": "^5.4.0"
 	},
 	"jest": {
 		"moduleFileExtensions": [