diff --git a/package-lock.json b/package-lock.json index 3ca6898..0515519 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1103,9 +1103,9 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "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/package.json b/package.json index 8b0ba66..d2fa648 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "express-session": "^1.15.6", "get-form-data": "^2.0.0", "json-addition": "^1.2.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "mongoose": "^5.7.5", "passport": "^0.4.0", "passport-local": "^1.0.0",