diff --git a/Hive Web Application/ClientApp/package-lock.json b/Hive Web Application/ClientApp/package-lock.json index 674b03e..b9eb87e 100644 --- a/Hive Web Application/ClientApp/package-lock.json +++ b/Hive Web Application/ClientApp/package-lock.json @@ -8138,9 +8138,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/Hive Web Application/ClientApp/package.json b/Hive Web Application/ClientApp/package.json index c59cf56..27ff80c 100644 --- a/Hive Web Application/ClientApp/package.json +++ b/Hive Web Application/ClientApp/package.json @@ -8,7 +8,7 @@ "bootstrap": "^4.1.3", "expose-loader": "^1.0.0", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "mobx": "^5.15.4", "mobx-react": "^6.2.2", "oidc-client": "^1.9.0",