]> source.dussan.org Git - gitignore.git/commitdiff
projects / gitignore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daffb4f c4ff566)
Merge branch 'master' of github.com:github/gitignore into keep-scm-files 1686/head
authorHonza Dvorsky <jan.dvorsky@yahoo.com>
Fri, 26 Feb 2016 00:07:20 +0000 (00:07 +0000)
committerHonza Dvorsky <jan.dvorsky@yahoo.com>
Fri, 26 Feb 2016 00:07:20 +0000 (00:07 +0000)
# Conflicts:
# Objective-C.gitignore
# Swift.gitignore

1  2 
Objective-C.gitignore patch | diff1 | diff2 | blob | history
Swift.gitignore patch | diff1 | diff2 | blob | history

diff --cc Objective-C.gitignore
Simple merge
diff --cc Swift.gitignore
Simple merge
A collection of useful .gitignore templates: https://github.com/github/gitignore