Merge branch 'master' of https://github.com/github/gitignore
Conflicts: Global/OSX.gitignore
This commit is contained in:
@@ -1,10 +1,24 @@
|
||||
.DS_Store
|
||||
|
||||
.AppleDouble
|
||||
|
||||
.LSOverride
|
||||
|
||||
Icon
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Thumbnails
|
||||
|
||||
._*
|
||||
|
||||
|
||||
|
||||
# Files that might appear on external disk
|
||||
|
||||
.Spotlight-V100
|
||||
|
||||
.Trashes
|
||||
|
||||
|
Reference in New Issue
Block a user