Fix Merge conflict

This commit is contained in:
Domisiding 2023-04-12 18:02:55 +02:00
parent f120d33e00
commit 22c1c26cd2

View File

@ -222,7 +222,6 @@ class NetworkDevice():
device_type_cf = self.nb.device_type.custom_fields
if(template_cf in device_type_cf):
self.template_name = device_type_cf[template_cf]
self.zbx_templates = [device_type_cf[template_cf]]
else:
e = (f"Custom field {template_cf} not "
f"found for {self.nb.device_type.manufacturer.name}"