From bce7df9f8a3c32cf299fb833ec99dde62bb53a96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 09:14:53 +0000 Subject: [PATCH] Bump merge from 1.2.1 to 2.1.1 in /hrm-react/HRM/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] --- hrm-react/HRM/ClientApp/package-lock.json | 6 +++--- hrm-react/HRM/ClientApp/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hrm-react/HRM/ClientApp/package-lock.json b/hrm-react/HRM/ClientApp/package-lock.json index 18cc16c..2718cc9 100644 --- a/hrm-react/HRM/ClientApp/package-lock.json +++ b/hrm-react/HRM/ClientApp/package-lock.json @@ -7945,9 +7945,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.3", diff --git a/hrm-react/HRM/ClientApp/package.json b/hrm-react/HRM/ClientApp/package.json index 06f51a3..609d727 100644 --- a/hrm-react/HRM/ClientApp/package.json +++ b/hrm-react/HRM/ClientApp/package.json @@ -6,7 +6,7 @@ "axios": "^0.21.1", "bootstrap": "^4.1.3", "jquery": "^3.5.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.9.0", "react": "^16.0.0", "react-dom": "^16.0.0",