jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/knx/translations/en.json
View File

@ -47,13 +47,9 @@
"data": { "data": {
"connection_type": "KNX Connection Type", "connection_type": "KNX Connection Type",
"individual_address": "Default individual address", "individual_address": "Default individual address",
<<<<<<< HEAD
=======
"local_ip": "Local IP of Home Assistant (use 0.0.0.0 for automatic detection)", "local_ip": "Local IP of Home Assistant (use 0.0.0.0 for automatic detection)",
>>>>>>> b9247f3952 (Fix local_ip handling in KNX options flow (#62969))
"multicast_group": "Multicast group used for routing and discovery", "multicast_group": "Multicast group used for routing and discovery",
"multicast_port": "Multicast port used for routing and discovery", "multicast_port": "Multicast port used for routing and discovery",
"local_ip": "Local IP (leave empty if unsure)",
"rate_limit": "Maximum outgoing telegrams per second", "rate_limit": "Maximum outgoing telegrams per second",
"state_updater": "Globally enable reading states from the KNX Bus" "state_updater": "Globally enable reading states from the KNX Bus"
} }

2
tests/components/shelly/test_device_trigger.py
View File

@ -198,7 +198,7 @@ async def test_get_triggers_non_initialized_devices(hass):
expected_triggers = [] expected_triggers = []
triggers = await async_get_device_automations( 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) assert_lists_same(triggers, expected_triggers)