diff --git a/package-lock.json b/package-lock.json index 45c8e06..4103e7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8972,9 +8972,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-deep": { "version": "3.0.2", diff --git a/package.json b/package.json index 9175f99..c852fc5 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "lazyload": "^2.0.0-rc.2", "lodash": "^4.17.15", "macaddress": "^0.2.9", - "merge": "^1.2.1", + "merge": "^2.1.1", "mime": "^2.4.4", "randomatic": "^3.1.1", "react": "^16.12.0",