Merge changes I8f2dfb5e,Ife185cda,I79a10fa7,Ib764cc42,I76efe755, ...

[gigi.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 12c5f0fd6a55918844b43a6e773ccdb431beaf4b..0f9f84ff85534c4892810444bae4c91422800e09 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,7 @@
 
 *.java text diff=java
 
-*.templ        text=lf
+*.templ        eol=lf
 *.txt  text
 *.md   text