From 9b2022927fddec4f495613512ea1df047d31125a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 May 2021 20:21:45 +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>
---
 npm-shrinkwrap.json | 6 +++---
 package.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d6a8a2b..234d293 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -663,9 +663,9 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "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-descriptors": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index fda215f..f991e20 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "deepmerge": "^4.0.0",
     "express": "^4.16.4",
     "lodash": "^4.17.15",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "serve-static": "^1.13.2",
     "watchr": "^2.4.13"
   },