summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-08 12:23:05 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-08 12:23:05 -0400
commite05e121ca0ed125946f8634cdc54b73ba295ecb1 (patch)
tree7cd31f6075f7d03a9c25f29146b392610f6c5efe /files
parent63b108234ed6e0d816c86dcbd88457b0ae1e06d6 (diff)
parent863e1d40a46f50ea66a30fe6b68e7a2c5ceb82d2 (diff)
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'files')
-rw-r--r--files/.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/files/.gitattributes b/files/.gitattributes
new file mode 100644
index 00000000..6129766f
--- /dev/null
+++ b/files/.gitattributes
@@ -0,0 +1,2 @@
+*.bin binary
+*.txt eol=crlf