Merge branch 'master' into 12033-multisite-search

[arvados.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8f2b33ad2f8484c274838299cca722256bbcafa0..0e876bb6f4d430eea2a79bbe34b0ee3f37c8a6fc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ tmp
 sdk/cli/binstubs/
 sdk/cwl/arvados_cwl/_version.py
 services/api/config/arvados-clients.yml
+*#*
+.DS_Store
+.vscode