diff options
| author | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-02 19:02:06 -0700 |
|---|---|---|
| committer | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-02 19:02:06 -0700 |
| commit | 8486f2204990f48c156408b0965142813b885043 (patch) | |
| tree | 861157a44eb512c144d3f50ece9a33fcbcb9a4c8 /Objective-C.gitignore | |
| parent | 4709f02b41f768188afd53c72be0ca9155226ce2 (diff) | |
| parent | 0a9d0c31e874488cf058c6aa55e85b45bc57c6d7 (diff) | |
| download | gitignore-8486f2204990f48c156408b0965142813b885043.tar.gz gitignore-8486f2204990f48c156408b0965142813b885043.zip | |
Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts:
Objective-C.gitignore
Diffstat (limited to 'Objective-C.gitignore')
| -rw-r--r-- | Objective-C.gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 014ad178..9207892a 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,6 +1,6 @@ # 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 |