docs/gitignore
docs
/
gitignore
mirror of https://github.com/github/gitignore
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Conflicts:
	Objective-C.gitignore
This commit is contained in:
Justin Spahr-Summers 2012-08-02 19:02:06 -07:00
parent 4709f02b41 0a9d0c31e8
commit 8486f22049
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objective-C.gitignore
View File

@ -1,6 +1,6 @@
# Xcode # Xcode
.DS_Store .DS_Store
build/* build/
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
@ -14,4 +14,4 @@ build/*
xcuserdata xcuserdata
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData