From 60bf07d88b41c3ad090ada5f6088e2045c082fad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2019 18:40:36 +0000
Subject: [PATCH] Bump webpack-merge from 4.2.1 to 4.2.2

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.1 to 4.2.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/v4.2.1...v4.2.2)

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

diff --git a/package-lock.json b/package-lock.json
index e64226db7..707ea5072 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18224,12 +18224,12 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
-			"integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+			"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.5"
+				"lodash": "^4.17.15"
 			}
 		},
 		"webpack-sources": {
diff --git a/package.json b/package.json
index b9dbb6966..9dded177a 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
 		"vue-template-compiler": "^2.6.10",
 		"webpack": "^4.39.2",
 		"webpack-cli": "^3.3.7",
-		"webpack-merge": "^4.2.1"
+		"webpack-merge": "^4.2.2"
 	},
 	"jest": {
 		"moduleFileExtensions": [