Merge pull request #1973 from kylehendricks/fix-unresolved-merge-conflict

Fix an unresolved merge conflict
2016-05-03 19:42:27 -07:00 · 2016-05-03 19:42:27 -07:00 · 2874ad3445
parent 4850a65ed0 8fc07ee6cd
commit 2874ad3445
1 changed files with 0 additions and 3 deletions
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@ -94,19 +94,16 @@ DISCOVERY_COMPONENTS = [
     [COMMAND_CLASS_THERMOSTAT_SETPOINT],
     TYPE_WHATEVER,
     GENRE_WHATEVER),
-<<<<<<< HEAD
    ('hvac',
     DISCOVER_HVAC,
     [COMMAND_CLASS_THERMOSTAT_FAN_MODE],
     TYPE_WHATEVER,
     GENRE_WHATEVER),
-=======
    ('lock',
     DISCOVER_LOCKS,
     [COMMAND_CLASS_DOOR_LOCK],
     TYPE_BOOL,
     GENRE_USER),
->>>>>>> pr/1969
 ]