Fix script merge conflict

pull/1924/head
Paulus Schoutsen 2016-04-28 13:39:44 +02:00
parent 31e019e88a
commit 1d28fa712f
1 changed files with 1 additions and 1 deletions
homeassistant/helpers

View File

@ -119,7 +119,7 @@ class Script():
"""Test if condition is matching."""
self.last_action = action.get(CONF_ALIAS, action[CONF_CONDITION])
check = condition.from_config(action)(self.hass, False)
self._log("Test condition %s: %s", self.last_action, check)
self._log("Test condition {}: {}".format(self.last_action, check))
return check
def _remove_listener(self):