summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-02-05 15:45:51 -0600
committerGitHub <noreply@github.com>2019-02-05 15:45:51 -0600
commite9149b86086c1f61309f788a22874ac5b0492e15 (patch)
treed2b59408df53676ffb65e217cc1a62cbcba05f97
parentb0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff)
parentbc4cc9f78a705636228c39311bb6e3c393f090d3 (diff)
Merge pull request #544 from Diegoisawesome/master
Add json to list of LF line-end files
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 96c1c1231..b095aa2cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@ Makefile text eol=lf
*.pl text eol=lf
*.inc text eol=lf
*.sha1 text eol=lf
+*.json text eol=lf
*.png binary
*.bin binary