aboutsummaryrefslogtreecommitdiffstats
path: root/Global
diff options
context:
space:
mode:
authorAdam Roben <adam@roben.org>2013-11-04 05:44:51 -0800
committerAdam Roben <adam@roben.org>2013-11-04 05:44:51 -0800
commit8480473de9bc01ac3af256fc6a06633088b9d3be (patch)
tree94dd9b1b39a436f8cb20f46afb4a7e0fd6242812 /Global
parent7a40a39053063d65d5cfd7004a70e4627652fb85 (diff)
parentda36175ff6de9673ad54959fc5d66835755093e8 (diff)
downloadgitignore-8480473de9bc01ac3af256fc6a06633088b9d3be.tar.gz
gitignore-8480473de9bc01ac3af256fc6a06633088b9d3be.zip
Merge pull request #804 from rutice/osx
Fix OSX-specific Icon\r rule
Diffstat (limited to 'Global')
-rw-r--r--Global/OSX.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
index cf8db5d9..65b94232 100644
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@ -1,8 +1,9 @@
.DS_Store
.AppleDouble
.LSOverride
-Icon
+# Icon must ends with two \r.
+Icon
# Thumbnails
._*