From 29bb65d5730927c5e8723f79cfcf0fbe22afe322 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 30 Mar 2017 15:05:49 -0400
Subject: [PATCH] manual pre-merge - should be safe, long EOL story

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 99b2185b92..bee2af83fa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,6 +14,8 @@
 *.mk text eol=lf
 *.java text eol=lf
 *.bat text eol=lf
+*.iml text eol=lf
+*.txt text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary