diff --git a/package-lock.json b/package-lock.json index 3e80c53..11a0d13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6978,9 +6978,9 @@ } }, "merge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", - "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.0.tgz", + "integrity": "sha512-TcuhVDV+e6X457MQAm7xIb19rWhZuEDEho7RrwxMpQ/3GhD5sDlnP188gjQQuweXHy9igdke5oUtVOXX1X8Sxg==" }, "merge-descriptors": { "version": "1.0.1", diff --git a/package.json b/package.json index e2e64b5..4ba7dfb 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "fs-extra-promise": "^1.0.1", "glob": "^7.1.6", "lodash": "^4.17.20", - "merge": "^1.2.1", + "merge": "^2.1.0", "minimatch": "^3.0.4", "mkdirp": "^1.0.4", "path": "^0.12.7",