changes to gardenshed

grymmy · Mar 13, 2024 · d82b7a7 · d82b7a7
1 parent f49eb42
commit d82b7a7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/firmware/gardenshed/gardenshed.py b/firmware/gardenshed/gardenshed.py
@@ -38,9 +38,12 @@ def runscript(script):
     case "start-debugger":  
         pass
 
+<<<<<<< HEAD
     case _:
         print("Unknown command!!")
 
+=======
+>>>>>>> Sheepy3-shellscriptchanges
 if args.flash:
 
     if not override: