diff options
Diffstat (limited to 'NeoRuntime/Runtime')
| -rw-r--r-- | NeoRuntime/Runtime/luxcena_neo/strip.py | 4 |
1 files changed, 0 insertions, 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 |