From ef256a64b815b639f5f902e2f2dc5311943b7fa0 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Tue, 25 Jan 2022 19:24:59 +1100 Subject: [PATCH] Fix config merging with null (#3113) --- esphome/config_helpers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py index 72362a3d73..39b57e441b 100644 --- a/esphome/config_helpers.py +++ b/esphome/config_helpers.py @@ -39,6 +39,8 @@ def merge_config(full_old, full_new): if not isinstance(old, list): return new return old + new + elif new is None: + return old return new