diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-26 13:50:04 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-26 13:50:04 -0400 |
| commit | e024c11f7a849a38e478cda9fb9939a838cfa2e0 (patch) | |
| tree | 9e37597ae11ac672d6b6b182294881145851506c /quantum | |
| parent | c37d52d2137acf5739c481cc0c8917ad6fd77161 (diff) | |
| download | qmk_firmware-e024c11f7a849a38e478cda9fb9939a838cfa2e0.tar.gz qmk_firmware-e024c11f7a849a38e478cda9fb9939a838cfa2e0.zip | |
actually resolves conflicts in rgblight.c
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/rgblight.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 789af73d80..8c9ad77364 100644 --- 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) { |