manual pre-merge - should be safe, long EOL story

2017-03-30 15:05:49 -04:00 · 2017-03-30 15:05:49 -04:00 · 29bb65d573
parent 1330c79c86
commit 29bb65d573
1 changed files with 2 additions and 0 deletions
--- 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