From 633d0c9b7956de5803765f911a7d06ca69373ad0 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 25 Feb 2025 14:15:35 -0500 Subject: [PATCH] Remove merge vestige --- netbox/netbox/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 95fa1a0b2..4e6e96d8a 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -791,7 +791,6 @@ if 'extras.events.process_event_queue' not in EVENTS_PIPELINE: EVENTS_PIPELINE.insert(0, 'extras.events.process_event_queue') # Register any configured plugins -incompatible_plugins = [] for plugin_name in PLUGINS: try: # Import the plugin module