Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.

[jquery.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index bcb36db..d6dc470 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-* crlf=input
+*     eol=lf
+*.jar binary