diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-06-11 14:42:08 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2014-06-11 14:42:08 +0200 |
| commit | 4511cfb3f975088eb4ebd388e00977cc2ed3787d (patch) | |
| tree | 449c5f75e49159d86034b57a695af846b8ce3b62 | |
| parent | f0ad93a14ffa3e329193daeff2677010e01b3c09 (diff) | |
| download | Goldfarmer-4511cfb3f975088eb4ebd388e00977cc2ed3787d.tar.gz | |
.gitattributes: Use native EOL
Should fix future conflicts due to the editor writing CRLF files.
| -rw-r--r-- | .gitattributes | 4 |
1 files 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 |