From e355fe82cad9de3b97e1d1ef7d707f755dcc96e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 01:18:08 +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    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index c2fa8d5..9cbb1d9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "file-exists": "^2.0.0",
     "fs": "0.0.1-security",
     "md5": "^2.2.1",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "mkpath": "^1.0.0",
     "path": "^0.12.7",
     "rework": "^1.0.1",
diff --git a/yarn.lock b/yarn.lock
index 90694c0..a141e24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -587,9 +587,9 @@ md5@^2.2.1:
     crypt "~0.0.1"
     is-buffer "~1.1.1"
 
-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"
 
 minimatch@^3.0.2:
   version "3.0.3"