resolves conflicts in rgblight.c

# Conflicts:
#	quantum/rgblight.c

diff --cc README.md
Simple merge

diff --cc quantum/rgblight.c
index 5623c65de71a9b00a680f4e802f67dbeb02a8fe4,6adc9e2784da0de143b928b144031f7956caacb5..789af73d80720061570ec26dfc239f2b850d6cfe
--- 1/quantum/rgblight.c
--- 2/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@@ -189,8 -189,8 +189,13 @@@ 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) {
@@@ -206,8 -206,8 +211,8 @@@
  
  void rgblight_toggle(void) {
    rgblight_config.enable ^= 1;
 -  eeconfig_write_rgblight(rgblight_config.raw);
 +  eeconfig_update_rgblight(rgblight_config.raw);
-   dprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable);
+   xprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable);
        if (rgblight_config.enable) {
                rgblight_mode(rgblight_config.mode);
        } else {
@@@ -299,8 -299,8 +304,8 @@@ void rgblight_sethsv(uint16_t hue, uint
                rgblight_config.hue = hue;
                rgblight_config.sat = sat;
                rgblight_config.val = val;
 -              eeconfig_write_rgblight(rgblight_config.raw);
 +              eeconfig_update_rgblight(rgblight_config.raw);
-               dprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+               xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
    }
  }