remove bad merge conflict

This commit is contained in:
Benjamin Auquite 2023-04-08 20:08:35 -05:00
commit 317ae3af13

View file

@ -1658,10 +1658,6 @@ class TurnOnOffListener:
# Track light transitions
self.transition_timers: dict[str, _AsyncSingleShotTimer] = {}
# When a state is different `max_cnt_significant_changes` times in a row,
# mark it as manually_controlled.
self.max_cnt_significant_changes = 2
self.remove_listener = self.hass.bus.async_listen(
EVENT_CALL_SERVICE, self.turn_on_off_event_listener
)