X-Git-Url: http://git.joshuawise.com/firearm.git/blobdiff_plain/fa1c06764950e6c965ed8ce1dcf180ae1ba2df1a..1783621cc5b0d6411aa33cf9961b29f8e440e605:/.gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c8120ab
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.hex -crlf -diff -merge
\ No newline at end of file