From c060dbca3d088907e24d400371d9d96d2f3c2815 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 03:21:02 +0000
Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /wwwroot/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>
---
 wwwroot/ClientApp/package-lock.json | 6 +++---
 wwwroot/ClientApp/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wwwroot/ClientApp/package-lock.json b/wwwroot/ClientApp/package-lock.json
index 4d6792a..c65b8b2 100644
--- a/wwwroot/ClientApp/package-lock.json
+++ b/wwwroot/ClientApp/package-lock.json
@@ -8419,9 +8419,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/wwwroot/ClientApp/package.json b/wwwroot/ClientApp/package.json
index e445e52..33e8642 100644
--- a/wwwroot/ClientApp/package.json
+++ b/wwwroot/ClientApp/package.json
@@ -13,7 +13,7 @@
     "eslint": "^6.8.0",
     "history": "^4.10.1",
     "jquery": "^3.4.1",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "oidc-client": "^1.10.1",
     "react": "^16.12.0",
     "react-chartjs-2": "^2.9.0",