Merge pull request #321 from Proxmark/iceman1001-patch-1

[proxmark3-svn] / .gitattributes

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

- 
\ No newline at end of file
+*.bin -crlf -diff