mirror of
https://github.com/TheNetworkGuy/netbox-zabbix-sync.git
synced 2025-07-16 20:22:56 -06:00
Fix Merge conflict
This commit is contained in:
parent
f120d33e00
commit
22c1c26cd2
@ -222,7 +222,6 @@ class NetworkDevice():
|
|||||||
device_type_cf = self.nb.device_type.custom_fields
|
device_type_cf = self.nb.device_type.custom_fields
|
||||||
if(template_cf in device_type_cf):
|
if(template_cf in device_type_cf):
|
||||||
self.template_name = device_type_cf[template_cf]
|
self.template_name = device_type_cf[template_cf]
|
||||||
self.zbx_templates = [device_type_cf[template_cf]]
|
|
||||||
else:
|
else:
|
||||||
e = (f"Custom field {template_cf} not "
|
e = (f"Custom field {template_cf} not "
|
||||||
f"found for {self.nb.device_type.manufacturer.name}"
|
f"found for {self.nb.device_type.manufacturer.name}"
|
||||||
|
Loading…
Reference in New Issue
Block a user