From b3817637a165f45511c07b05149ea8e60b09b117 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 08:46:49 +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.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dacbb5c..2eeea3d 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "markdown-it-footnote": "^3.0.1",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "metalsmith": "^2.1.0",
     "metalsmith-branch": "0.0.5",
     "metalsmith-clean-css": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index d8bbf24..b00311f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4130,6 +4130,11 @@ merge@^1.1.3, merge@^1.2.0:
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
+merge@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
+
 metalsmith-branch@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/metalsmith-branch/-/metalsmith-branch-0.0.5.tgz#42f79f99c5ff0dd848f261255668afb3fcfe04bc"