From 567f8bf4a8796c82022379f8affb44d2ccaac245 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 01:17:15 +0000
Subject: [PATCH] Bump merge from 1.2.0 to 2.1.1

Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 2.1.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2e6cca..8cc7306 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "deep-freeze-strict": "^1.1.1",
     "detect-browser": "^1.12.0",
     "es6-promise": "^3.1.2",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "modernizr": "^3.5.0",
     "moment": "^2.18.1",
     "page.js": "^4.13.3",
diff --git a/yarn.lock b/yarn.lock
index bcc57c5..9961694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3145,6 +3145,10 @@ merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
+merge@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+
 micromatch@^2.1.5:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"