diff --git a/ClientApp/package-lock.json b/ClientApp/package-lock.json index a88de96..84ac9de 100644 --- a/ClientApp/package-lock.json +++ b/ClientApp/package-lock.json @@ -8262,9 +8262,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/ClientApp/package.json b/ClientApp/package.json index 195b329..b16aa37 100644 --- a/ClientApp/package.json +++ b/ClientApp/package.json @@ -7,7 +7,7 @@ "@material-ui/icons": "^4.2.1", "babel-eslint": "10.0.1", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.9.0-beta.4", "react": "^16.0.0", "react-dom": "^16.0.0",