From 7e4490432db60c13971f9938b445e0a207d49d49 Mon Sep 17 00:00:00 2001
From: Jakob Stendahl <jakob.stendahl@outlook.com>
Date: Sun, 10 Oct 2021 23:30:58 +0200
Subject: :hammer: Fix merge conflict

---
 NeoRuntime/Runtime/luxcena_neo/strip.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/NeoRuntime/Runtime/luxcena_neo/strip.py b/NeoRuntime/Runtime/luxcena_neo/strip.py
index e8bf476..e973ed2 100644
--- a/NeoRuntime/Runtime/luxcena_neo/strip.py
+++ b/NeoRuntime/Runtime/luxcena_neo/strip.py
@@ -1,10 +1,6 @@
 import json
 from os import path
-<<<<<<< Updated upstream
 import rpi_ws281x as ws
-=======
-# from .neopixel import *
->>>>>>> Stashed changes
 from .matrix import Matrix, get_segment_range
 from .power_calc import calcCurrent
 
-- 
cgit v1.2.3