From 8e4d729f79e5d264666bb6c2a7d48cf02e5bfaf8 Mon Sep 17 00:00:00 2001
From: f10atin9 <f10atin9@kubesphere.io>
Date: Thu, 2 Sep 2021 13:03:10 +0800
Subject: [PATCH] resolve conflicted

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

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