diff --git a/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package-lock.json b/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package-lock.json index 9554a3c..74c5162 100644 --- a/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package-lock.json +++ b/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package-lock.json @@ -8049,9 +8049,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.3", diff --git a/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package.json b/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package.json index 682f285..09f0ade 100644 --- a/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package.json +++ b/Scenario_1/1_Starting/CAWI/CAWI/ClientApp/package.json @@ -5,7 +5,7 @@ "dependencies": { "bootstrap": "^4.1.3", "jquery": "^3.4.1", - "merge": "^1.2.1", + "merge": "^2.1.1", "oidc-client": "^1.9.0", "react": "^16.0.0", "react-dom": "^16.0.0",