Auto merge of #28525 - teymour-aldridge:gitignore, r=jdm

Remove `settings.json` from `.gitignore`.

Also add `Brewfile.lock.json` to the list of ignored files.

Signed-off-by: teymour-aldridge <teymour.aldridge@icloud.com>

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because they do not modify any code files

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2021-06-25 08:07:55 -04:00 committed by GitHub
commit 55205fb462
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

4
.gitignore vendored
View file

@ -41,6 +41,7 @@ capture_webrender/
# VSCode
.vscode
!/.vscode/extensions.json
!/.vscode/settings.json
# Emacs
*~
@ -67,3 +68,6 @@ support/hololens/.vs/
# Layout debugger trace files
layout_trace*
# Package managers
etc/taskcluster/macos/Brewfile.lock.json