]> git.donarmstrong.com Git - qmk_firmware.git/commit
fix breaking build: remove merge conflict text
authorRyan Mitchell <rmitch@onprem.com>
Thu, 21 Dec 2017 03:19:45 +0000 (21:19 -0600)
committerJack Humbert <jack.humb@gmail.com>
Thu, 21 Dec 2017 03:27:09 +0000 (22:27 -0500)
commit3b9e4967b89383307e00cbcb05061d3a1830c07e
tree69b9fb2c13ce5b5f3ce838c52b5d5192c244b01d
parent7c57104b51903bfb1f7e35a5195222e13def7557
fix breaking build: remove merge conflict text
keyboards/dz60/keymaps/iso_7u_space/keymap.c