up

2026-01-10 03:26:17 +01:00
parent bceac40518
commit 8de9a0dd87
20 changed files with 179 additions and 1636 deletions
--- a/internal/devices/webswitch/webswitch.go
+++ b/internal/devices/webswitch/webswitch.go
@@ -142,12 +142,8 @@ func (c *Client) GetStatus() (*Status, error) {

 	// Parse response format: "1,1\n2,1\n3,1\n4,1\n5,0\n"
 	status := &Status{
-<<<<<<< HEAD
 		Relays:    make([]RelayState, 0, 5),
 		Connected: true,
-=======
-		Relays: make([]RelayState, 0, 5),
->>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	}

 	lines := strings.Split(strings.TrimSpace(string(body)), "\n")