diff --git a/package-lock.json b/package-lock.json index 13eb424..52a199e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7081,9 +7081,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 f1153f0..878e568 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "handlebars-helpers": "^0.10.0", "helper-date": "^1.0.1", "jsonpath": "^1.0.2", - "merge": "^1.2.1", + "merge": "^2.1.1", "mime-types": "^2.1.26", "mkdirp": "^1.0.3", "promisepipe": "^3.0.0",