summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-04-27 19:18:54 -0400
committerGitHub <noreply@github.com>2020-04-27 19:18:54 -0400
commitbe27df15551017c0f4d0aaf81bf2fd253aa03736 (patch)
tree1ea0fb95ecd495bd136be822ca30c6bc9af91232
parent44b31fbc9d86b0efabda27165a53a0f125ae53dd (diff)
parent96d9f081dfad6fad2b6519b0f2b0653ac3480604 (diff)
Merge branch 'master' into pikalax_work
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..7aba79ac
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sha1 text eol=lf