From 1d28fa712f3ac997234c2c9cfe544327c6512c80 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 28 Apr 2016 13:39:44 +0200
Subject: [PATCH] Fix script merge conflict

---
 homeassistant/helpers/script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 4abf01a471e..de5951a3ad4 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -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):