From 4511cfb3f975088eb4ebd388e00977cc2ed3787d Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Wed, 11 Jun 2014 14:42:08 +0200
Subject: .gitattributes: Use native EOL

Should fix future conflicts due to the editor writing CRLF files.
---
 .gitattributes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index a380642..9209c5b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-*.java eol=lf text
-*.properties eol=lf text
+*.java text
+*.properties text
-- 
cgit v1.2.1