diff --git a/package.json b/package.json index db4219cf..e4de0a86 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "jest-cli": "^24.0.0", "jquery": "^3.5.0", "js-cookie": "^2.2.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "moment": "^2.24.0", "oboe": "^2.1.4", "react": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 90602ccf..0cafbcdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3920,10 +3920,10 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge@^1.2.1: - 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== micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10"