This PR tries to resolve the conflict when trying to merge our branch back to upstream. The only change in this PR is the ignored patterns in the .gitignore file.
Given this PR has very few changes and only has changes in .gitignore, so I'll merge it directly without reviewers' approval.
This PR tries to resolve the conflict when trying to merge our branch back to upstream. The only change in this PR is the ignored patterns in the
.gitignore
file.Given this PR has very few changes and only has changes in
.gitignore
, so I'll merge it directly without reviewers' approval.