Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts: Objective-C.gitignore
This commit is contained in:
commit
8486f22049
@ -1,6 +1,6 @@
|
||||
# Xcode
|
||||
.DS_Store
|
||||
build/*
|
||||
build/
|
||||
*.pbxuser
|
||||
!default.pbxuser
|
||||
*.mode1v3
|
||||
@ -14,4 +14,4 @@ build/*
|
||||
xcuserdata
|
||||
profile
|
||||
*.moved-aside
|
||||
DerivedData
|
||||
DerivedData
|
||||
|
Loading…
Reference in New Issue
Block a user