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
Commit 8486f220 authored Aug 03, 2012 by Justin Spahr-Summers
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
 # Xcode
 .DS_Store
-build/*
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -14,4 +14,4 @@ build/*
 xcuserdata
 profile
 *.moved-aside
-DerivedData
\ No newline at end of file
+DerivedData