Update factory.go

Signed-off-by: wuyue <wuyue_andrew@outlook.com>
volcano-sh · Nov 8, 2023 · 51320d2 · 51320d2
1 parent 7635571
commit 51320d2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pkg/scheduler/plugins/factory.go b/pkg/scheduler/plugins/factory.go
@@ -57,11 +57,8 @@ func init() {
 	framework.RegisterPluginBuilder(cdp.PluginName, cdp.New)
 	framework.RegisterPluginBuilder(rescheduling.PluginName, rescheduling.New)
 	framework.RegisterPluginBuilder(usage.PluginName, usage.New)
-<<<<<<< HEAD
 	framework.RegisterPluginBuilder(pdb.PluginName, pdb.New)
-=======
 	framework.RegisterPluginBuilder(nodegroup.PluginName, nodegroup.New)
->>>>>>> 5e084e555 (add nodegroup plugin)
 
 	// Plugins for Queues
 	framework.RegisterPluginBuilder(proportion.PluginName, proportion.New)