Skip to content

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

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

Conflicts:
	Objective-C.gitignore
parents f78c09ff 6670a4c4
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
Objective-C.gitignore
View file @ f1cb24b9
...@@ -15,3 +15,4 @@ xcuserdata ...@@ -15,3 +15,4 @@ xcuserdata
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData
.idea/
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