diff --git a/ClientApp/package-lock.json b/ClientApp/package-lock.json index f6a0a07..2e34da9 100644 --- a/ClientApp/package-lock.json +++ b/ClientApp/package-lock.json @@ -10632,9 +10632,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 0c5d0bd..03b80bc 100644 --- a/ClientApp/package.json +++ b/ClientApp/package.json @@ -15,7 +15,7 @@ "babel-eslint": "10.1.0", "bootstrap": "^4.4.1", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "node-sass": "^4.13.1", "oidc-client": "^1.10.1", "react": "^16.13.1",