manual pre-merge - should be safe, long EOL story
This commit is contained in:
parent
1330c79c86
commit
29bb65d573
|
@ -14,6 +14,8 @@
|
||||||
*.mk text eol=lf
|
*.mk text eol=lf
|
||||||
*.java text eol=lf
|
*.java text eol=lf
|
||||||
*.bat 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.
|
# Denote all files that are truly binary and should not be modified.
|
||||||
*.png binary
|
*.png binary
|
||||||
|
|
Loading…
Reference in New Issue