update csiDriver apiVersion

Signed-off-by: f10atin9 <[email protected]>
dkeven · Sep 6, 2021 · d99434f · d99434f
1 parent b68ff57
commit d99434f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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"