sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-07 13:40:59 +00:00
Code Issues Releases Wiki Activity

Fix config merging with null (#3113)

Browse Source
This commit is contained in:
Joshua Spence 2022-01-25 19:24:59 +11:00 committed by GitHub
parent 1de941e837
commit ef256a64b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/config_helpers.py
View File

@ -39,6 +39,8 @@ def merge_config(full_old, full_new):
if not isinstance(old, list): if not isinstance(old, list):
return new return new
return old + new return old + new
elif new is None:
return old
return new return new