Merge pull request #1546 from Coeur/patch-1

DerivedData and xcuserdata are folders; *.xcuserstate is always inside
2016-01-27 15:27:31 +10:30
parent 8ae0b3e125 f17925fe61
commit 352c903c34
3 changed files with 10 additions and 12 deletions
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -4,7 +4,7 @@

 ## Build generated
 build/
-DerivedData
+DerivedData/

 ## Various settings
 *.pbxuser
@@ -15,12 +15,11 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/

 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint

 ## Obj-C/Swift specific