mirror of
https://github.com/home-assistant/core.git
synced 2025-07-15 17:27:10 +00:00
Fix an unresolved merge conflict
This commit is contained in:
parent
4850a65ed0
commit
8fc07ee6cd
@ -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
|
||||
]
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user