projects
/
qmk_firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c37d52d
)
actually resolves conflicts in rgblight.c
author
Jack Humbert
<jack.humb@gmail.com>
Tue, 26 Apr 2016 17:50:04 +0000
(13:50 -0400)
committer
Jack Humbert
<jack.humb@gmail.com>
Tue, 26 Apr 2016 17:50:04 +0000
(13:50 -0400)
quantum/rgblight.c
patch
|
blob
|
history
diff --git
a/quantum/rgblight.c
b/quantum/rgblight.c
index 789af73d80720061570ec26dfc239f2b850d6cfe..8c9ad773645f827da1740d791dcd9dd997084be2 100644
(file)
--- a/
quantum/rgblight.c
+++ b/
quantum/rgblight.c
@@
-189,13
+189,8
@@
void rgblight_mode(uint8_t mode) {
} else {
rgblight_config.mode = mode;
}
-<<<<<<< HEAD
eeconfig_update_rgblight(rgblight_config.raw);
- dprintf("rgblight mode: %u\n", rgblight_config.mode);
-=======
- eeconfig_write_rgblight(rgblight_config.raw);
xprintf("rgblight mode: %u\n", rgblight_config.mode);
->>>>>>> pr/286
if (rgblight_config.mode == 1) {
rgblight_timer_disable();
} else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) {