From 10263f500a2db1bdde64ba8177cbb092b9c8d6d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 03:10:09 +0000 Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /InvoiceManagement/ClientApp 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] --- InvoiceManagement/ClientApp/package-lock.json | 6 +++--- InvoiceManagement/ClientApp/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/InvoiceManagement/ClientApp/package-lock.json b/InvoiceManagement/ClientApp/package-lock.json index 83b202b..03cceea 100644 --- a/InvoiceManagement/ClientApp/package-lock.json +++ b/InvoiceManagement/ClientApp/package-lock.json @@ -7989,9 +7989,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-deep": { "version": "3.0.2", diff --git a/InvoiceManagement/ClientApp/package.json b/InvoiceManagement/ClientApp/package.json index f3bc817..2f3a862 100644 --- a/InvoiceManagement/ClientApp/package.json +++ b/InvoiceManagement/ClientApp/package.json @@ -5,7 +5,7 @@ "dependencies": { "bootstrap": "^4.5.0", "jquery": "^3.5.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.10.1", "react": "^16.13.1", "react-dom": "^16.13.1",