merge conflict #5 and #6 resolved

2024-05-13 13:53:02 +02:00
parent a7ea53be11 96a7efdb6b
commit b1811bc8a7
6 changed files with 229 additions and 1 deletions
--- a/src/Dezibot.h
+++ b/src/Dezibot.h
@@ -17,6 +17,7 @@
 #include "multiColorLight/MultiColorLight.h"
 #include "motionDetection/MotionDetection.h"

+
 class Dezibot {
 protected: