diff --git a/package.json b/package.json index 271f4ff..875d35c 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "d3-transition": "^1.1.0", "dom-resize": "^1.0.3", "invariant": "^2.1.1", - "merge": "^1.2.0", + "merge": "^2.1.1", "moment": "^2.18.1", "moment-duration-format": "^1.3.0", "prop-types": "^15.5.10", diff --git a/yarn.lock b/yarn.lock index d300dfb..82ace1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7198,6 +7198,11 @@ merge@^1.2.0: resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== +merge@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98" + integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w== + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"