From 1fa61d0f0c386679f8f2421d680f3678e5692349 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 03:04:32 +0000
Subject: [PATCH] Bump webpack-merge from 5.4.1 to 5.5.0

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.4.1...v5.5.0)

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

diff --git a/package.json b/package.json
index 1dc89f74d..836aa4c56 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0",
     "webpack-manifest-plugin": "^3.0.0",
-    "webpack-merge": "^5.4.1"
+    "webpack-merge": "^5.5.0"
   },
   "dependencies": {
     "annotator": "wallabag/annotator#master",
diff --git a/yarn.lock b/yarn.lock
index 04798aeaf..bfb3c2ae8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6992,10 +6992,10 @@ webpack-merge@^4.2.2:
   dependencies:
     lodash "^4.17.15"
 
-webpack-merge@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.1.tgz#1cfd7386b1876b69c17bbf72abc4325604decefc"
-  integrity sha512-ubwNFcKJjm5BwPH1U8ZHTMaq2+XJqyvcfWXXU6yv4IIWWPWAFvgicok8VK1OiA7iYhl33aJxL5hvwTuZuNBIHw==
+webpack-merge@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.5.0.tgz#18b860249ee3f940ed1607c6b0cf1912b27dbf44"
+  integrity sha512-EYKu2To70zpXh65y+ERG/8TbOy0YxPERP1hGvl5nnx7zY0HLZU57zNRlIowiPYQ8lI7kXsCHa5owKMgv/ImW/w==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"