Fix config merging with null (#3113)

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

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