diff options
author | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-27 09:21:15 -0700 |
---|---|---|
committer | Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> | 2012-08-27 09:21:32 -0700 |
commit | c61686f9888e088bf6fad726100138b0270126ba (patch) | |
tree | 508ec6394bbf55813a8b16dbf4f25f6de378a1e5 | |
parent | f1cb24b9c2cc212f241256955ff12081896e7a66 (diff) | |
parent | 964de38e9b75e3c716496180001e1765ca3ecd9d (diff) | |
download | gitignore-c61686f9888e088bf6fad726100138b0270126ba.tar.gz gitignore-c61686f9888e088bf6fad726100138b0270126ba.zip |
Merge remote-tracking branch 'exalted/master'
-rw-r--r-- | Global/OSX.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index bdc30421..fb44efc6 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -1,5 +1,6 @@ .DS_Store
.AppleDouble
+.LSOverride
Icon
|