Skip to content

G
gitignore
Commit 8486f220 authored by Justin Spahr-Summers's avatar Justin Spahr-Summers
Browse files
Options

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

Conflicts:
	Objective-C.gitignore
parents 4709f02b 0a9d0c31
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Objective-C.gitignore
View file @ 8486f220
# Xcode # Xcode
.DS_Store .DS_Store
build/* build/
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment