From d99434f60d729ca350ee2c01081ec7eb0c5a3cee Mon Sep 17 00:00:00 2001
From: f10atin9 <f10atin9@kubesphere.io>
Date: Wed, 1 Sep 2021 17:56:29 +0800
Subject: [PATCH] update csiDriver apiVersion

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
---
 .../storage/capability/capability_controller_test.go          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/controller/storage/capability/capability_controller_test.go b/pkg/controller/storage/capability/capability_controller_test.go
index 22486e5e5..0f9738bd9 100644
--- 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"