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

Conflicts: Objective-C.gitignore

Merge remote-tracking branch 'stig/patch-1'
Conflicts: Objective-C.gitignore
f1cb24b9 · Justin Spahr-Summers · f78c09ff · 6670a4c4 · f1cb24b9
显示空白变更内容
内联并排

Showing with 1 addition and 0 deletion

Objective-C.gitignore Objective-C.gitignore +1 -0

未找到文件。
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/