From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Fri, 14 Jun 2019 19:57:24 +0000 (+0200)
Subject: Minor fixes to guard mode and removed conversation
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=9288859e8e5cabfe79b603afb0de93c13454f5fa;p=homeassistant.git

Minor fixes to guard mode and removed conversation
---

diff --git a/automation/guard_mode.yaml b/automation/guard_mode.yaml
index ba10a748..205200d7 100644
--- a/automation/guard_mode.yaml
+++ b/automation/guard_mode.yaml
@@ -53,7 +53,7 @@
       event: start 
 
   condition:
-    condition: and    
+    condition: or    
     conditions:
       - condition: zone
         entity_id: device_tracker.google_maps_115265981849847357125
diff --git a/configuration.yaml b/configuration.yaml
index 7c14aeec..d6dadd69 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -59,7 +59,7 @@ discovery:
 #    - google_cast
 
 # Allows you to issue voice commands from the frontend in enabled browsers
-conversation:
+#conversation:
 
 # Enables support for tracking state changes over time
 history: !include history.yaml