Pin merge 1.2.1 (#393)

Summary:
This addresses [CVE-2018-16469](https://nvd.nist.gov/vuln/detail/CVE-2018-16469).
Pull Request resolved: https://github.com/facebook/flipper/pull/393

Reviewed By: danielbuechele

Differential Revision: D14342214

Pulled By: passy

fbshipit-source-id: fc5c7a552f413f54f31f3c2cfb12fd511ecbd35e
This commit is contained in:
Pascal Hartig
2019-03-07 03:04:18 -08:00
committed by Facebook Github Bot
parent 83aee0cd75
commit 817c488220

View File

@@ -4836,9 +4836,9 @@ merge2@^1.2.3:
integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
version "1.2.1"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
methods@~1.1.2:
version "1.1.2"