mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	Fix bad merge conflict
This commit is contained in:
		| @@ -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 | ||||
|             } | ||||
|         ) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user