From 219dfefece9d843f63601830e1a24abc5068549d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 09:03:55 +0000
Subject: [PATCH] Bump webpack-merge from 5.4.0 to 5.5.0

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.0 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.0...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 d0729365..caae6235 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "sortablejs": "^1.12.0",
     "underscore": "^1.12.0",
     "vis": "^4.21.0",
-    "webpack-merge": "^5.4.0"
+    "webpack-merge": "^5.5.0"
   },
   "devDependencies": {
     "webpack-dev-server": "^3.11.0"
diff --git a/yarn.lock b/yarn.lock
index d07dfba4..1d5736d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7846,10 +7846,10 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz#81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3"
-  integrity sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==
+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"