diff --git a/package.json b/package.json index fc0907c..2841c16 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint-staged": "^8.1.5", "lodash.get": "^4.4.2", "mdbid": "^1.0.0", - "merge": "^1.2.1", + "merge": "^2.1.1", "prettier": "^1.14.2", "ramda": "^0.25.0", "rimraf": "^3.0.2", diff --git a/yarn.lock b/yarn.lock index 13a1225..7cc2eca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6636,10 +6636,10 @@ merge2@^1.2.3: resolved "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== -merge@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/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"