diff --git a/FSE.UI/ClientApp/package-lock.json b/FSE.UI/ClientApp/package-lock.json index 68486e8..9e3531a 100644 --- a/FSE.UI/ClientApp/package-lock.json +++ b/FSE.UI/ClientApp/package-lock.json @@ -8522,9 +8522,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/FSE.UI/ClientApp/package.json b/FSE.UI/ClientApp/package.json old mode 100755 new mode 100644 index 18d29cc..33fc39f --- a/FSE.UI/ClientApp/package.json +++ b/FSE.UI/ClientApp/package.json @@ -7,7 +7,7 @@ "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.9.0", "react": "^16.0.0", "react-bootstrap": "^1.0.1",