Merge pull request github#482 from amalrik/change_global_osx_to_unix_…

…line_endings change the line endings of Global/OSX from dos to unix format
chengxingyu123 · Dec 19, 2012 · 016ba1e · 016ba1e
2 parents 4f86c33 + 044043f
commit 016ba1e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
@@ -1,12 +1,12 @@
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes