update csiDriver apiVersion

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
2021-09-01 17:56:29 +08:00
parent b68ff57e60
commit d99434f60d
1 changed files with 4 additions and 0 deletions
--- a/pkg/controller/storage/capability/capability_controller_test.go
+++ b/pkg/controller/storage/capability/capability_controller_test.go
@@ -19,6 +19,10 @@
 package capability

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