fix conflict

PhilGruber · Jun 28, 2024 · d5cf2b9 · d5cf2b9
1 parent f9fc89e
commit d5cf2b9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/devices/device.go b/devices/device.go
@@ -35,6 +35,7 @@ type Device struct {
 	LastChanged *time.Time `json:"-"`
 	Type        string
 	Hidden      bool
+	Name        string
 }
 
 func (d *Device) GetCurrent() float64 {

diff --git a/server.go b/server.go
@@ -44,13 +44,10 @@ func main() {
 			devices[deviceConfig.Name] = dimmyDevices.NewPlug(deviceConfig)
 		case "temperature":
 			devices[deviceConfig.Name] = dimmyDevices.NewTemperature(deviceConfig)
-<<<<<<< Updated upstream
 		case "thermostat":
 			devices[deviceConfig.Name] = dimmyDevices.NewThermostat(deviceConfig)
-=======
 		case "ztemperature":
 			devices[deviceConfig.Name] = dimmyDevices.NewZTemperature(deviceConfig)
->>>>>>> Stashed changes
 		case "group":
 		default:
 			log.Println("Skipping deviceConfig of unknown type '" + deviceConfig.Type + "'")