diff --git a/package-lock.json b/package-lock.json index 771e053..9cbceae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5655,9 +5655,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/package.json b/package.json index 0853dbb..55f05b2 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "json-stable-stringify": "^1.0.1", "lodash": "^4.17.13", "memory-cache": "^0.2.0", - "merge": ">=1.2.1", + "merge": ">=2.1.1", "mongoose": "^5.4.19", "node-sass-middleware": "^0.11.0", "passport": "^0.4.0",