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>

Bump merge from 1.2.1 to 2.1.1
f74c647a · dependabot[bot] · Aniket · b571e2ca · f74c647a · f74c647a
Commit f74c647a authored Oct 06, 2021 by dependabot[bot] Committed by Aniket Oct 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

package-lock.json package-lock.json +3 -3

package.json package.json +1 -1

No files found.
--- a/package-lock.json
+++ b/package-lock.json
@@ -31110,9 +31110,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",
--- a/package.json
+++ b/package.json
@@ -170,7 +170,7 @@
    "jquery": "^3.3.1",
    "jszip": "^3.6.0",
    "latest-version": "^5.1.0",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
    "npm-install-version": "^6.0.2",
    "react": "^17.0.2",
    "react-beautiful-dnd": "^13.1.0",