Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-01-03 11:21:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix bad merge conflict

Browse source
This commit is contained in:
Jesse Hills 2021-08-11 21:45:04 +12:00
parent b0bc898278
commit 6847645782
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
esphome/components/sensor/__init__.py
View file

@ -258,11 +258,11 @@ def sensor_schema(
): validate_last_reset_type ): validate_last_reset_type
} }
) )
if last_reset_type_ != LAST_RESET_TYPE_NONE: if last_reset_type != LAST_RESET_TYPE_NONE:
schema = schema.extend( schema = schema.extend(
{ {
cv.Optional( cv.Optional(
CONF_LAST_RESET_TYPE, default=last_reset_type_ CONF_LAST_RESET_TYPE, default=last_reset_type
): validate_last_reset_type ): validate_last_reset_type
} }
) )