diff options
| author | Carl Suster <carl@contraflo.ws> | 2014-04-06 10:38:40 +1000 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2014-04-06 10:38:40 +1000 |
| commit | b3d27fcf04fa9d8346278d0720bf4cbe0aaee6a4 (patch) | |
| tree | 1098130ceb2133c6e72e59d234feda0bf43d4306 /Global/Xcode.gitignore | |
| parent | f21b38a70da5036d52b004f8c6e550575230d20e (diff) | |
| parent | 5f4223833162b45377e9900b6da8340f5992dc82 (diff) | |
| download | gitignore-b3d27fcf04fa9d8346278d0720bf4cbe0aaee6a4.tar.gz gitignore-b3d27fcf04fa9d8346278d0720bf4cbe0aaee6a4.zip | |
Merge branch 'fix-1022'
Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.
This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
Diffstat (limited to 'Global/Xcode.gitignore')
| -rw-r--r-- | Global/Xcode.gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 3dad88c9..3a130f18 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -11,5 +11,3 @@ xcuserdata *.xccheckout *.moved-aside DerivedData -*.hmap -*.ipa |