.gitignore: Update

This commit is contained in:
Ryan Pavlik 2020-07-15 20:11:53 -07:00 committed by Jakob Bornecrantz
parent c0cb04d59a
commit 95f6ae0dc9

1
.gitignore vendored
View file

@ -33,6 +33,7 @@ build*/
# Ignore local settings
.vscode
*.autosave
.vs
# Ignore merge-conflict resolution files
*.orig