Merge remote-tracking branch 'origin/master'

mothur · 17671de3329850ea5a6889ba48fa1b7d1b3314ca · mothur-westcott committed Sep 22, 2016 · Sep 22, 2016 · 17671de
2 parents 145fb9c + f55c7c6
commit 17671de3329850ea5a6889ba48fa1b7d1b3314ca
Unified Split

Showing with 1 addition and 0 deletions.

+1 −0 .gitignore
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ xcuserdata
 project.xcworkspace
 *.xcuserdata
 TARGET_BUILD_DIRTARGET_BUILD_DIR
+DerivedData
 *.xcuserdata
 *.xml
 nbproject/