Merge pull request #715 from tailwindcss/dependabot/npm_and_yarn/next/merge-1.2.1

[Security] Bump merge from 1.2.0 to 1.2.1
This commit is contained in:
Adam Wathan 2019-03-05 08:20:46 -05:00 • committed by GitHub
commit 126803a6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3427,9 +3427,9 @@ merge-stream@^1.0.1:
readable-stream "^2.0.1"
merge@^1.1.3:
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==
micromatch@^2.1.5, micromatch@^2.3.11:
version "2.3.11"