From 9aaca086054ce389d1a979a61591b88f73284819 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 02:13:54 +0000
Subject: [PATCH] chore(deps-dev): 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 | 14 +++++++++++---
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d99d0e1..806cdd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10070,6 +10070,14 @@
       "requires": {
         "findup-sync": "^3.0.0",
         "merge": "^1.2.1"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+          "dev": true
+        }
       }
     },
     "find-root": {
@@ -16103,9 +16111,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-descriptors": {
diff --git a/package.json b/package.json
index d066177..0cad66e 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "jest": "^24.5.0",
     "jest-serializer-vue": "^1.0.0",
     "lodash": "4.17.19",
-    "merge": "1.2.1",
+    "merge": "2.1.1",
     "nightwatch": "^1.0.14",
     "node-notifier": "^8.0.1",
     "node-sass": "^4.13.1",