diff --git a/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package-lock.json b/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package-lock.json index 4d6792a..c65b8b2 100644 --- a/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package-lock.json +++ b/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package-lock.json @@ -8419,9 +8419,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/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package.json b/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package.json index e445e52..33e8642 100644 --- a/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package.json +++ b/obj/Release/netcoreapp3.1/PubTmp/Out/wwwroot/ClientApp/package.json @@ -13,7 +13,7 @@ "eslint": "^6.8.0", "history": "^4.10.1", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.10.1", "react": "^16.12.0", "react-chartjs-2": "^2.9.0",