Fixes .gitattributes

TeamMetallurgy · Feb 19, 2015 · d95ec14 · d95ec14
1 parent d65ed1b
commit d95ec14
Showing 1 changed file with 8 additions and 22 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,22 +1,8 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+* text eol=lf
+*.jar binary
+*.png binary
+*.xcf binary
+*.java text eol=lf
+mcmod.info text eol=lf
+*.sh text eol=lf
+*.bat text eol=crlf