mirror of
https://github.com/esphome/esphome.git
synced 2024-11-10 09:17:46 +01:00
Fix config merging with null (#3113)
This commit is contained in:
parent
1de941e837
commit
ef256a64b8
1 changed files with 2 additions and 0 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue