Fix merge conflicts

This commit is contained in:
Paulus Schoutsen
2022-01-04 14:48:13 -08:00
parent 599c6240f4
commit 41b43199a3
2 changed files with 1 additions and 5 deletions
@@ -198,7 +198,7 @@ async def test_get_triggers_non_initialized_devices(hass):
expected_triggers = []
triggers = await async_get_device_automations(
hass, DeviceAutomationType.TRIGGER, coap_wrapper.device_id
hass, "trigger", coap_wrapper.device_id
)
assert_lists_same(triggers, expected_triggers)