Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9841761..0c12fb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@
 /classes
 .externalToolBuilders/Jalview Release indices [Builder].launch
 /.DS_Store
+.DS_Store
 /.com.apple.timemachine.supported
+.gitattributes
+
+