merge conflict fix

automations/04_kids_and_announcements.yaml

@@ -5,14 +5,14 @@
   description: Triggers an Alexa notification at 8:00 PM if the Google Calendar event
     is 'Girls at Home'
   triggers:
-  - at: '20:00:00'
+  - at: '20:30:00'
     trigger: time
     enabled: true
   conditions:
   - condition: time
     weekday:
+    - fri
     - sat
-    - sun
   - condition: state
     entity_id: calendar.family_events
     state: 'on'
@@ -36,6 +36,7 @@
   conditions:
   - condition: time
     weekday:
+    - sun
     - mon
     - tue
     - wed

automations/05_printers_and_workshop.yaml

@@ -269,7 +269,7 @@
     data: {}
   mode: single
 - id: '1770944104889'
-  alias: Pints-Charming-Lights-On-Print-Started
+  alias: Prints-Charming-Lights-On-Print-Started
   description: 'Repaired by agent: replaced deleted Bambu device trigger with P1S
     print_status entity trigger.'
   triggers:

automations/07_climate_and_plugs.yaml

@@ -1,6 +1,6 @@
 # Climate and plug automations.
 
-- id: hermes_ac_controls_matter_plugs
+- id: ac_controls_matter_plugs
   alias: AC controls Matter plugs
   description: Turn the four Tapo Matter plugs on while the Ecobee is actively cooling, and off when cooling stops.
   mode: restart
@@ -58,8 +58,9 @@
       entity_id: switch.parents_window_fan
   - action: notify.notify_events_alerts
     data:
+
       title: Dehumidifier tank is full
-      message: Dehumidifier tank is full — Parents Window Fan outlet has been turned off.
+      message: Dehumidifier tank is full — Dehumidifer outlet has been turned off.
 
 - id: dehumidifier_tank_sensor_low_battery
   alias: Dehumidifier Tank Sensor Low Battery