Merge pull request #435 from ytisf/master

[proxmark3-svn] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 2a8d66c2c2d63be47229abb16e68fa94b0882b79..fda790b843ef5d61273a0942c1328c773c9595af 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@
 # prevent binary files from CRLF handling, diff and merge:
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff
 # prevent binary files from CRLF handling, diff and merge:
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff

+*.z -crlf -diff