From 045ce1fa4974b8b3db5915be1c0816538be411a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 10 Dec 2018 02:21:56 +0000 Subject: [PATCH] Bump webpack-merge from 4.1.4 to 4.1.5 in /settings Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [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/commits) Signed-off-by: dependabot[bot] --- settings/package-lock.json | 6 +++--- settings/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/settings/package-lock.json b/settings/package-lock.json index 48ced718de..7abb8edee5 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -7427,9 +7427,9 @@ } }, "webpack-merge": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", - "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", + "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/settings/package.json b/settings/package.json index d2e6407078..df3cd9f207 100644 --- a/settings/package.json +++ b/settings/package.json @@ -43,6 +43,6 @@ "vue-template-compiler": "^2.5.17", "webpack": "^4.27.1", "webpack-cli": "^3.1.2", - "webpack-merge": "^4.1.4" + "webpack-merge": "^4.1.5" } }