diff options
| author | Jakob Stendahl <jakob.stendahl@outlook.com> | 2021-10-10 23:30:58 +0200 |
|---|---|---|
| committer | Jakob Stendahl <jakob.stendahl@outlook.com> | 2021-10-10 23:30:58 +0200 |
| commit | 7e4490432db60c13971f9938b445e0a207d49d49 (patch) | |
| tree | 339ec1ce507cfb1ee096aed8317b9302cee2d87c | |
| parent | 76cd8292c5b80749ece1ab6558f3ed410a618f0d (diff) | |
| download | Luxcena-Neo-7e4490432db60c13971f9938b445e0a207d49d49.tar.gz Luxcena-Neo-7e4490432db60c13971f9938b445e0a207d49d49.zip | |
:hammer: Fix merge conflict
| -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 |