aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 12:30:17 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 12:30:17 -0400
commita6e109caa1e813d18f76f2b23dfd1655b6acf691 (patch)
tree2f8d823848eeb968b7bdb233fc8b4a222289d488 /.gitattributes
parentf6d1ce7863893e6dd0233c57f04b262f6808d78a (diff)
parenta8375fa15a6ca9285eb15ae89bcda898349e06f8 (diff)
downloadfirmware-a6e109caa1e813d18f76f2b23dfd1655b6acf691.tar.gz
firmware-a6e109caa1e813d18f76f2b23dfd1655b6acf691.tar.bz2
firmware-a6e109caa1e813d18f76f2b23dfd1655b6acf691.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 99f09f5f5..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-* text=auto
-*.hex -diff \ No newline at end of file