merged

config/rules.yaml

@@ -9,7 +9,11 @@ rules:
     thermostats:
     - thermostat_bad_unten
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_esszimmer
@@ -23,7 +27,11 @@ rules:
     thermostats:
     - thermostat_esszimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -38,7 +46,11 @@ rules:
     thermostats:
     - thermostat_wohnzimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -55,7 +67,11 @@ rules:
     thermostats:
     - thermostat_kueche
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -71,7 +87,11 @@ rules:
     thermostats:
     - thermostat_patty
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -85,7 +105,11 @@ rules:
     thermostats:
     - thermostat_schlafzimmer
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -99,7 +123,11 @@ rules:
     thermostats:
     - thermostat_wolfgang
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_bad_oben
@@ -112,6 +140,10 @@ rules:
     thermostats:
     - thermostat_bad_oben
   params:
+<<<<<<< HEAD
     eco_target: 6.0
+=======
+    eco_target: 5.0
+>>>>>>> main
     open_min_secs: 20
     close_min_secs: 20