diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-03 16:10:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-03 16:10:38 -0400 |
| commit | bbc0c82a9fe36f435943cc59149aa0edc26f7fc9 (patch) | |
| tree | fe3f9a30e816daad6dc6b1e9b1df9d4aa382412d | |
| parent | b5dccf7bfc3c345501551229a4e65c6726d3b78b (diff) | |
| parent | ae5720bd68f9d1910ade441017190c41e175b643 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index a14f043a..0ab03c06 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ *.sha1 text eol=lf charmap.txt text eol=crlf working-tree-encoding=utf-16le-bom files/msgdata/msg/*.txt eol=crlf working-tree-encoding=utf-16le-bom -*.key binary +*.key binary
\ No newline at end of file |