Merge remote-tracking branch 'origin'

[mothur.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ac6f4409bf8be051d0665c0743bf853f42579f25..fb4ae5123e7cdc9f64ab449b496415f8edd27733 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
-.DS_Store
-*.zip
+*.logfile
+*.o
 *.pbxproj
+*.xcuserdata
+*.zip
+.DS_Store
+.idea
+build
+xcuserdata