Merge branch 'WS2813' of https://github.com/alex-Arc/FastLED into WS2813

# Conflicts:
#	FastLED.h

1 files changed, 4 insertions, 0 deletions

diff --git a/FastLED.h b/FastLED.h
index 7d017fd3..e8bcad37 100644
--- a/FastLED.h
+++ b/FastLED.h
@@ -350,7 +350,11 @@ public:
 	{
 		switch(CHIPSET) {
 			case OCTOWS2811: { static COctoWS2811Controller<RGB_ORDER> controller; return addLeds(&controller, data, nLedsOrOffset, nLedsIfOffset); }
+<<<<<<< HEAD
 			case OCTOWS2811_400: { static COctoWS2811Controller<RGB_ORDER,WS2811_400kHz> controller; return addLeds(&controller, data, nLedsOrOffset, nLedsIfOffset); }
+=======
+			case OCTOWS2811_400: { static COctoWS2811Controller<RGB_ORDER,true> controller; return addLeds(&controller, data, nLedsOrOffset, nLedsIfOffset); }
+>>>>>>> a88d1a99c84e53188bacb92de4c01c2cf450dbe3
       case OCTOWS2813: { static COctoWS2811Controller<RGB_ORDER,WS2813_800kHz> controller; return addLeds(&controller, data, nLedsOrOffset, nLedsIfOffset); }
 		}
 	}