From 2cecbe5ccc17e100afdaa314ca93e6e6f374cf71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 May 2021 20:35:23 +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 | 16 ++++++++++++----
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index accc291f3..870b24588 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.17.12",
+  "version": "0.17.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3743,6 +3743,14 @@
       "dev": true,
       "requires": {
         "merge": "^1.2.0"
+      },
+      "dependencies": {
+        "merge": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+          "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+          "dev": true
+        }
       }
     },
     "execa": {
@@ -8426,9 +8434,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/package.json b/package.json
index 8bc798423..711b96af1 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "load-grunt-tasks": "^4.0.0",
     "lodash": "^4.17.19",
     "lodash.template": "^4.5.0",
-    "merge": ">=1.2.1",
+    "merge": ">=2.1.1",
     "minimatch": ">=3.0.4",
     "minimist": "1.2.3",
     "mixin-deep": "^1.3.2",