diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/package-lock.json | 6 | ||||
| -rw-r--r-- | settings/package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/settings/package-lock.json b/settings/package-lock.json index 8822e5f7492..816551d8aba 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -7892,9 +7892,9 @@ } }, "webpack-merge": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", - "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", + "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/settings/package.json b/settings/package.json index c4426b93e44..57e2114dc43 100644 --- a/settings/package.json +++ b/settings/package.json @@ -43,6 +43,6 @@ "vue-template-compiler": "^2.5.21", "webpack": "^4.28.3", "webpack-cli": "^3.2.0", - "webpack-merge": "^4.1.5" + "webpack-merge": "^4.2.1" } } |