From 6175aea8abbc9e712abd3ba4d549ca19f13a28fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 May 2021 23:26:47 +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 85d4cac..dda622a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4160,9 +4160,9 @@
       "dev": true
     },
     "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
     },
     "micromatch": {
diff --git a/package.json b/package.json
index 720d41e..1236ddf 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
         "karma-opera-launcher": "^1.0.0",
         "karma-qunit": "^4.0.0",
         "karma-safari-launcher": "^1.0.0",
-        "merge": "^1.2.1",
+        "merge": "^2.1.1",
         "prettier": "^2.0.5",
         "qunit": "^2.9.3",
         "qunitjs": "^2.4.1",