diff --git a/app/package-lock.json b/app/package-lock.json index 6f2f36d..c9a7754 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -8492,9 +8492,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/app/package.json b/app/package.json index 4c78d6d..505771b 100644 --- a/app/package.json +++ b/app/package.json @@ -37,7 +37,7 @@ "jest-resolve": "24.9.0", "jest-watch-typeahead": "0.4.2", "jquery": "3.5.0", - "merge": "1.2.1", + "merge": "2.1.1", "mini-css-extract-plugin": "0.9.0", "optimize-css-assets-webpack-plugin": "5.0.3", "pnp-webpack-plugin": "1.6.4",