diff --git a/package.json b/package.json index 14657bce..14b4df26 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "graphql-tag": "^2.10.0", "isomorphic-fetch": "^2.2.1", "jquery": "^3.5.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "popper.js": "^1.14.4", "prop-types": "^15.6.2", "react": "^16.6.1", diff --git a/yarn.lock b/yarn.lock index 2b9fd604..7c8b9319 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5931,11 +5931,16 @@ merge-stream@^1.0.1: dependencies: readable-stream "^2.0.1" -merge@^1.2.0, merge@^1.2.1: +merge@^1.2.0: version "1.2.1" 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"