From a41b1b8e9a2d30b23144cb8c1c589fecd00e8f08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 May 2021 19:45:07 +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-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 670535a..9bbfee6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@material-ui/styles": "4.3.3",
         "@types/websocket": "^1.0.1",
         "base-64": "0.1.0",
-        "classnames": "latest",
+        "classnames": "*",
         "date-fns": "2.2.1",
         "fontawesome": "4.7.2",
         "http-proxy": ">=1.18.1",
@@ -27,7 +27,7 @@
         "ini": ">=1.3.6",
         "js-cookie": "2.2.0",
         "material-design-icons": "3.0.1",
-        "merge": "1.2.1",
+        "merge": "2.1.1",
         "mui-datatables": "3.3.1",
         "node-notifier": ">=8.0.1",
         "object-path": "^0.11.5",
@@ -13988,9 +13988,9 @@
       }
     },
     "node_modules/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=="
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
@@ -34014,9 +34014,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=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 1b79120..6422ae1 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "ini": ">=1.3.6",
     "js-cookie": "2.2.0",
     "material-design-icons": "3.0.1",
-    "merge": "1.2.1",
+    "merge": "2.1.1",
     "mui-datatables": "3.3.1",
     "node-notifier": ">=8.0.1",
     "object-path": "^0.11.5",