Merge branch 'master' into GenericTracing
[legacy-proxmark3.git] / .gitattributes
blobef225ce2ba1f521a4e339cc8875e9f003cd914cf
1 # .gitattributes
2 # prevent binary files from CRLF handling, diff and merge:
3 fpga/fpga.bit -crlf -diff
4