Remove merge conflict

boschglobal · Oct 9, 2024 · 218b98c · 218b98c
1 parent 501d436
commit 218b98c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/providers/src/airflow/providers/edge/provider.yaml b/providers/src/airflow/providers/edge/provider.yaml
@@ -39,10 +39,6 @@ plugins:
 executors:
   - airflow.providers.edge.executors.EdgeExecutor
 
-plugins:
-  - name: edge_executor
-    plugin-class: airflow.providers.edge.plugins.edge_executor_plugin.EdgeExecutorPlugin
-
 config:
   edge:
     description: |