Permalink
Browse files

removes the crlf bits from .gitattributes

that shouldn't have been merged.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
  • Loading branch information...
1 parent b829621 commit 28973b79e2ebfca28d51c792027c5e279501aad4 @Mloc Mloc committed Mar 25, 2014
Showing with 1 addition and 12 deletions.
  1. +1 −12 .gitattributes
View
@@ -1,13 +1,2 @@
-*.css text eol=crlf
-*.dm text eol=crlf
-*.dme text eol=crlf
-*.dmf text eol=crlf
-*.dmm text eol=crlf
-*.dms text eol=crlf
-*.htm text eol=crlf
-*.html text eol=crlf
-*.js text eol=crlf
-*.py text eol=crlf
-*.txt text eol=crlf
-
*.dmm merge=merge-dmm
+

0 comments on commit 28973b7

Please sign in to comment.