From 9a247a77d47c5ce33d2398e6641c0a85342a5d4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Jun 2018 07:54:40 +0000 Subject: [PATCH] Bump webpack-merge from 4.1.2 to 4.1.3 in /settings Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3. - [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.1.2...v4.1.3) 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 1a734cef5ce..2204cdf78c7 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -6464,9 +6464,9 @@ } }, "webpack-merge": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz", - "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz", + "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/settings/package.json b/settings/package.json index 1d2e55b46be..9412ed00cf1 100644 --- a/settings/package.json +++ b/settings/package.json @@ -38,6 +38,6 @@ "vue-template-compiler": "^2.5.16", "webpack": "^4.12.0", "webpack-cli": "^3.0.3", - "webpack-merge": "^4.1.2" + "webpack-merge": "^4.1.3" } }