From 2d66395c731cffc13e4c11370e96b2c02acc721e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 02:25:32 +0000
Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in
 /QuestWrapper/QuestWrap/ClientApp

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>
---
 QuestWrapper/QuestWrap/ClientApp/package-lock.json | 6 +++---
 QuestWrapper/QuestWrap/ClientApp/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/QuestWrapper/QuestWrap/ClientApp/package-lock.json b/QuestWrapper/QuestWrap/ClientApp/package-lock.json
index 4043979..5c145cc 100644
--- a/QuestWrapper/QuestWrap/ClientApp/package-lock.json
+++ b/QuestWrapper/QuestWrap/ClientApp/package-lock.json
@@ -8324,9 +8324,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-deep": {
       "version": "3.0.2",
diff --git a/QuestWrapper/QuestWrap/ClientApp/package.json b/QuestWrapper/QuestWrap/ClientApp/package.json
index 9b4d445..b9a782b 100644
--- a/QuestWrapper/QuestWrap/ClientApp/package.json
+++ b/QuestWrapper/QuestWrap/ClientApp/package.json
@@ -8,7 +8,7 @@
     "connected-react-router": "6.2.1",
     "history": "4.7.2",
     "jquery": "^3.4.1",
-    "merge": "1.2.1",
+    "merge": "2.1.1",
     "popper.js": "^1.14.7",
     "react": "16.7.0",
     "react-dom": "16.7.0",