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.
This commit is contained in:
Carl Suster
2014-04-06 10:38:40 +10:00
2 changed files with 18 additions and 3 deletions

View File

@@ -11,5 +11,3 @@ xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa