From 802303398ff2ce1dcb12883302ba7b53a46a4609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 May 2021 22:26:16 +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 | 14 +++++++++++---
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 509ebe8..6eab219 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3372,6 +3372,13 @@
       "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
       "requires": {
         "merge": "^1.2.0"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+        }
       }
     },
     "execa": {
@@ -6714,9 +6721,10 @@
       }
     },
     "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==",
+      "dev": true
     },
     "merge-descriptors": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index c5a862e..f928698 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,6 @@
 	},
 	"devDependencies": {
 		"gh-pages": "^1.2.0",
-		"merge": "^1.2.1"
+		"merge": "^2.1.1"
 	}
 }