Permalink
Browse files

Restoring EOL to CRLF. SORRY EVERYONE

  • Loading branch information...
1 parent f46f17e commit 06b7f62ea2bce66114cb6c0a6be084690e25c588 @jbogard jbogard committed Apr 15, 2012
Showing with 8 additions and 33 deletions.
  1. +8 −33 .gitattributes
View
@@ -13,37 +13,12 @@
*.png binary
*.gif binary
-*.cs text diff=csharp
-*.vb text
-*.c text
-*.cpp text
-*.cxx text
-*.h text
-*.hxx text
-*.py text
-*.rb text
-*.java text
-*.html text
-*.htm text
-*.css text
-*.scss text
-*.sass text
-*.less text
-*.js text
-*.lisp text
-*.clj text
-*.sql text
-*.php text
-*.lua text
-*.m text
-*.asm text
-*.erl text
-*.fs text
-*.fsx text
-*.hs text
+core.eol crlf
-*.csproj text merge=union
-*.vbproj text merge=union
-*.fsproj text merge=union
-*.dbproj text merge=union
-*.sln text eol=crlf merge=union
+*.cs diff=csharp
+
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+*.sln merge=union

0 comments on commit 06b7f62

Please sign in to comment.