diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-16 19:36:40 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-07-16 19:36:40 -0400 |
| commit | 2809b4f9dd08dd1e83e87f1f4088ba22f3f66cd2 (patch) | |
| tree | e87027c60d5de0811f6213d087c677bc59295bd0 /.gitattributes | |
| parent | e2e01efa84d2ed46d004edf48076e4701accc176 (diff) | |
| parent | 617351aebc59e27a5f9a8a3b38032637a49f5432 (diff) | |
Merge branch 'master' into micropython-25ae98f-merge
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index eb32a4d0d..dea88c0a6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,6 +12,7 @@ *.dxf binary *.mpy binary *.deb binary +*.zip binary # These should also not be modified by git. tests/basics/string_cr_conversion.py -text |