From cc77d39795a9885eaa15247ac598ff7a3d54becd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 08:44:56 +0000
Subject: [PATCH] chore(deps): 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 | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23ab6a6d..d878edf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -507,7 +507,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npm.taobao.org/babel-helper-function-name/download/babel-helper-function-name-6.24.1.tgz",
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "requires": { 
+      "requires": {
         "babel-helper-get-function-arity": "^6.24.1",
         "babel-runtime": "^6.22.0",
         "babel-template": "^6.24.1",
@@ -4667,9 +4667,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz?cache=0&sync_timestamp=1605346561237&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmerge%2Fdownload%2Fmerge-1.2.1.tgz",
-      "integrity": "sha1-OL6/gMMiCopIe2/Ps5QbsRcgwUU="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-stream": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index 3a911aa9..b5b7f804 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "koa-router": "^5.4.0",
     "koa-send": "^3.3.0",
     "koa-static": "^2.0.0",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "mkdir-p": "0.0.7",
     "node-parallel": "^0.1.6",
     "node-serial": "^0.1.1",