Merge remote-tracking branch 'OliverLetterer/patch-1'

Conflicts: Objective-C.gitignore

Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts: Objective-C.gitignore
8486f220 · Justin Spahr-Summers · 4709f02b · 0a9d0c31 · 8486f220
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

Objective-C.gitignore Objective-C.gitignore +2 -2

未找到文件。
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
 # Xcode
 .DS_Store
-build/*
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3