corrected changes to gardenshed

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