diff --git a/full-stack-app/package-lock.json b/full-stack-app/package-lock.json index ba325f3..4b34b8e 100644 --- a/full-stack-app/package-lock.json +++ b/full-stack-app/package-lock.json @@ -4719,9 +4719,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-descriptors": { "version": "1.0.1", diff --git a/full-stack-app/package.json b/full-stack-app/package.json index 138ea61..ae6e1a3 100644 --- a/full-stack-app/package.json +++ b/full-stack-app/package.json @@ -28,7 +28,7 @@ "handlebars": "^4.5.3", "handlebars-helpers": "^0.10.0", "handlebars-layouts": "^3.1.4", - "merge": "^1.2.1", + "merge": "^2.1.1", "moment": "^2.24.0", "mongoose": "^5.9.2", "morgan": "^1.9.1",