From 22c1c26cd27d7067d282c74abf429570da8dc9b8 Mon Sep 17 00:00:00 2001 From: Domisiding Date: Wed, 12 Apr 2023 18:02:55 +0200 Subject: [PATCH] Fix Merge conflict --- netbox_zabbix_sync.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox_zabbix_sync.py b/netbox_zabbix_sync.py index 96ed59a..cd521e1 100755 --- a/netbox_zabbix_sync.py +++ b/netbox_zabbix_sync.py @@ -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}"