From 5ea8f28f58efc4336c6775ffb21a36121a6b24f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 02:21:59 +0000
Subject: [PATCH] chore(deps-dev): bump merge

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                              | 14 +++++++++++---
 .../api-gateway-multiple-origin-cors/package.json  |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/examples/apps/api-gateway-multiple-origin-cors/package-lock.json b/examples/apps/api-gateway-multiple-origin-cors/package-lock.json
index 3a6a0fc..78c7d3e 100644
--- a/examples/apps/api-gateway-multiple-origin-cors/package-lock.json
+++ b/examples/apps/api-gateway-multiple-origin-cors/package-lock.json
@@ -1062,6 +1062,14 @@
       "dev": true,
       "requires": {
         "merge": "^1.1.3"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+          "dev": true
+        }
       }
     },
     "execa": {
@@ -3221,9 +3229,9 @@
       }
     },
     "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==",
       "dev": true
     },
     "merge-stream": {
diff --git a/examples/apps/api-gateway-multiple-origin-cors/package.json b/examples/apps/api-gateway-multiple-origin-cors/package.json
index d87477c..da049ed 100644
--- a/examples/apps/api-gateway-multiple-origin-cors/package.json
+++ b/examples/apps/api-gateway-multiple-origin-cors/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "jest": "^23.1.0",
     "lodash": ">=4.17.13",
-    "merge": ">=1.2.1"
+    "merge": ">=2.1.1"
   },
   "jest": {
     "testPathIgnorePatterns": [