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