Merge branch 'dev'

* dev:
  Fix a config bug in Automation
pull/62/head
Paulus Schoutsen 2015-03-14 19:20:53 -07:00
commit 5f734f4dd9
1 changed files with 1 additions and 2 deletions

View File

@ -5,11 +5,10 @@ homeassistant.components.automation
Allows to setup simple automation rules via the config file. Allows to setup simple automation rules via the config file.
""" """
import logging import logging
import json
from homeassistant.loader import get_component from homeassistant.loader import get_component
from homeassistant.helpers import config_per_platform from homeassistant.helpers import config_per_platform
from homeassistant.util import convert, split_entity_id from homeassistant.util import split_entity_id
from homeassistant.const import ATTR_ENTITY_ID from homeassistant.const import ATTR_ENTITY_ID
DOMAIN = "automation" DOMAIN = "automation"