From bd85ec67cc185649ff436d84dd186e6c62b92528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Aug 2020 01:07:07 +0000
Subject: [PATCH] Bump webpack-merge from 5.1.1 to 5.1.2

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.1 to 5.1.2.
- [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.1...v5.1.2)

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

diff --git a/package-lock.json b/package-lock.json
index e1ad652ae..124b903b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6363,7 +6363,8 @@
 				},
 				"kind-of": {
 					"version": "6.0.2",
-					"resolved": ""
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -18980,7 +18981,8 @@
 				},
 				"kind-of": {
 					"version": "6.0.2",
-					"resolved": ""
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 				}
 			}
 		},
@@ -22144,9 +22146,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz",
-			"integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==",
+			"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==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index 29b492a54..8b69715c7 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
 		"webpack": "^4.44.1",
 		"webpack-cli": "^3.3.12",
 		"webpack-dev-server": "^3.11.0",
-		"webpack-merge": "^5.1.1"
+		"webpack-merge": "^5.1.2"
 	},
 	"jest": {
 		"moduleFileExtensions": [