resolve conflicted

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-02 13:03:10 +08:00
parent 1755ac5443
commit 8e4d729f79
1 changed files with 0 additions and 4 deletions
--- a/pkg/controller/storage/capability/capability_controller_test.go
+++ b/pkg/controller/storage/capability/capability_controller_test.go
@@ -19,10 +19,6 @@
 package capability

 import (
-<<<<<<< HEAD
-=======
-	"github.com/google/go-cmp/cmp"
->>>>>>> update csiDriver apiVersion
 	"reflect"
 	"testing"
 	"time"