resolve conflict

volcano-sh · Aug 17, 2023 · 80caaf1 · 80caaf1
1 parent dc30bd5
commit 80caaf1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/pkg/scheduler/capabilities/volumebinding/volume_binding.go b/pkg/scheduler/capabilities/volumebinding/volume_binding.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"sync"
 	"time"
+
 	"volcano.sh/volcano/cmd/scheduler/app/options"
 
 	v1 "k8s.io/api/core/v1"
@@ -37,12 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
-<<<<<<< HEAD
-=======
-
-	"volcano.sh/volcano/cmd/scheduler/app/options"
 	"volcano.sh/volcano/pkg/features"
->>>>>>> 54e3b40ae8c7e69d6eb899dd9f9ce684d27d2b4f
 )
 
 const (

diff --git a/pkg/scheduler/capabilities/volumebinding/volume_binding_test.go b/pkg/scheduler/capabilities/volumebinding/volume_binding_test.go
@@ -19,10 +19,8 @@ package volumebinding
 import (
 	"context"
 	"testing"
-<<<<<<< HEAD
+
 	"volcano.sh/volcano/cmd/scheduler/app/options"
-=======
->>>>>>> 54e3b40ae8c7e69d6eb899dd9f9ce684d27d2b4f
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -41,8 +39,6 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/framework"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
 	"k8s.io/kubernetes/pkg/scheduler/framework/runtime"
-
-	"volcano.sh/volcano/cmd/scheduler/app/options"
 	"volcano.sh/volcano/pkg/features"
 )