mirror of
https://github.com/esphome/esphome.git
synced 2025-02-01 23:22:57 +01:00
Fix bad merge conflict
This commit is contained in:
parent
b0bc898278
commit
6847645782
@ -258,11 +258,11 @@ def sensor_schema(
|
||||
): validate_last_reset_type
|
||||
}
|
||||
)
|
||||
if last_reset_type_ != LAST_RESET_TYPE_NONE:
|
||||
if last_reset_type != LAST_RESET_TYPE_NONE:
|
||||
schema = schema.extend(
|
||||
{
|
||||
cv.Optional(
|
||||
CONF_LAST_RESET_TYPE, default=last_reset_type_
|
||||
CONF_LAST_RESET_TYPE, default=last_reset_type
|
||||
): validate_last_reset_type
|
||||
}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user