Merge remote-tracking branch 'stig/patch-1'
Conflicts: Objective-C.gitignore
This commit is contained in:
commit
f1cb24b9c2
@ -15,3 +15,4 @@ xcuserdata
|
|||||||
profile
|
profile
|
||||||
*.moved-aside
|
*.moved-aside
|
||||||
DerivedData
|
DerivedData
|
||||||
|
.idea/
|
||||||
|
Loading…
Reference in New Issue
Block a user