]> git.donarmstrong.com Git - qmk_firmware.git/commit
resolves conflicts in rgblight.c
authorJack Humbert <jack.humb@gmail.com>
Tue, 26 Apr 2016 17:48:36 +0000 (13:48 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 26 Apr 2016 17:48:36 +0000 (13:48 -0400)
commitc37d52d2137acf5739c481cc0c8917ad6fd77161
tree2fdaf2f195094efbd9fe0680579cf85602e5584c
parent0edc7a9d87ecbbce580cbbd0b0fffaad24f37f83
parent27e3294909175dea1ae8618cace8f50d33e1dc98
resolves conflicts in rgblight.c

# Conflicts:
# quantum/rgblight.c
README.md
quantum/rgblight.c