From b8c8970cd1edf89c3477e9510805ace82be56a64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2020 07:52:59 +0000
Subject: [PATCH] Bump webpack-merge from 5.1.2 to 5.1.4

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.2 to 5.1.4.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.1.2...v5.1.4)

Signed-off-by: dependabot[bot] <support@github.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 dd7132f7d..d3f34a423 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20170,9 +20170,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.2.tgz",
-			"integrity": "sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
+			"integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index d34b94bea..4f0d76ea7 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
 		"webpack": "^4.44.1",
 		"webpack-cli": "^3.3.12",
 		"webpack-dev-server": "^3.11.0",
-		"webpack-merge": "^5.1.2"
+		"webpack-merge": "^5.1.4"
 	},
 	"jest": {
 		"moduleFileExtensions": [