summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-06-30 16:53:43 -0400
committerGitHub <noreply@github.com>2020-06-30 16:53:43 -0400
commite0dc4d48743a37385de13a7412316c7488ecea2e (patch)
tree9683d6468706d824c54900ec54e9139f7f8897e2
parent7073552e7606b11353370c314bfacf949b0fd8e6 (diff)
parent3706f5edabc9633e941ddeaeadb7a6c18bf46b3b (diff)
Merge branch 'master' into pikalax_work
-rw-r--r--files/.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/files/.gitattributes b/files/.gitattributes
index 6129766f..d827ef67 100644
--- a/files/.gitattributes
+++ b/files/.gitattributes
@@ -1,2 +1,4 @@
*.bin binary
*.txt eol=crlf
+.knarcignore eol=lf
+.knarckeep eol=lf