From: Jack Humbert <jack.humb@gmail.com>
Date: Tue, 26 Apr 2016 17:50:04 +0000 (-0400)
Subject: actually resolves conflicts in rgblight.c
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e024c11f7a849a38e478cda9fb9939a838cfa2e0;p=qmk_firmware.git

actually resolves conflicts in rgblight.c
---

diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 789af73d8..8c9ad7736 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) {