mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge v3.1.8

Browse Source
This commit is contained in:
jeremystretch
2022-02-15 10:05:07 -05:00
parent b40afd1006 b5e4fdc3d8
commit aa85ae89c1
14 changed files with 113 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/utils.py
View File

@ -204,7 +204,7 @@ def deepmerge(original, new):
"""
merged = OrderedDict(original)
for key, val in new.items():
if key in original and isinstance(original[key], dict) and isinstance(val, dict):
if key in original and isinstance(original[key], dict) and val and isinstance(val, dict):
merged[key] = deepmerge(original[key], val)
else:
merged[key] = val