From a194796d28762a25408c49021afbb0d9ceb7f573 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 03:06:52 +0000
Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1

Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.1 to 2.1.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.1...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.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 a64b487..826cc7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6962,9 +6962,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-stream": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index c42ba64..2581c54 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "es6-promise": "^4.2.8",
     "es6-shim": "^0.35.5",
     "js-md5": "^0.7.3",
-    "merge": ">=1.2.1",
+    "merge": ">=2.1.1",
     "npm": "^6.14.8",
     "promise-polyfill": "^8.1.3",
     "randomatic": ">=3.0.0",