Merge pull request #159 from frappe/dependabot/npm_and_yarn/merge-1.2.1

Bump merge from 1.2.0 to 1.2.1
This commit is contained in:
Sagar Sharma 2022-12-30 11:35:32 +05:30 committed by GitHub
commit cd56d6eeb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2496,8 +2496,9 @@ merge-stream@^2.0.0:
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
merge@^1.1.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
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"