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

Fix merge conflict

Browse Source
This commit is contained in:
Fabian Affolter 2017-10-23 13:49:04 +02:00
parent 9794336113
commit 32f58baa85
No known key found for this signature in database
GPG Key ID: DDF3D6F44AAB1336
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/automation/event.py
View File

@ -31,7 +31,7 @@ def async_trigger(hass, config, action):
event_type = config.get(CONF_EVENT_TYPE) event_type = config.get(CONF_EVENT_TYPE)
event_data_schema = vol.Schema( event_data_schema = vol.Schema(
config.get(CONF_EVENT_DATA), config.get(CONF_EVENT_DATA),
extra=vol.ALLOW_EXTRA) extra=vol.ALLOW_EXTRA) if config.get(CONF_EVENT_DATA) else None
@callback @callback
def handle_event(event): def handle_event(event):