Merge remote-tracking branch 'origin'

[mothur.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 853fd84a4e280293f81727c25057644c758cd2c0..fb4ae5123e7cdc9f64ab449b496415f8edd27733 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-.DS_Store
-*.zip
+*.logfile
+*.o
 *.pbxproj
-*.xcuserdata
\ No newline at end of file
+*.xcuserdata
+*.zip
+.DS_Store
+.idea
+build
+xcuserdata