From 017adf507d5447a197d1f3d8fb2196b15a31e436 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 13:50:00 +0100
Subject: [PATCH] fix(deps): update dependency merge to v2 (#910)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e50d1c24e..f994954ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5395,9 +5395,9 @@
             }
         },
         "merge": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-            "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.0.tgz",
+            "integrity": "sha512-TcuhVDV+e6X457MQAm7xIb19rWhZuEDEho7RrwxMpQ/3GhD5sDlnP188gjQQuweXHy9igdke5oUtVOXX1X8Sxg=="
         },
         "merge-descriptors": {
             "version": "1.0.1",
diff --git a/package.json b/package.json
index cbe9b9c98..170179f32 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
         "html-escaper": "^3.0.0",
         "image-size": "^0.9.0",
         "jsonpath": "^1.0.2",
-        "merge": "^1.2.1",
+        "merge": "^2.0.0",
         "mime-types": "^2.1.26",
         "nanoid": "^3.1.10",
         "promisepipe": "^3.0.0",