Fixed header conflict from 1.12.4 merge

Signed-off-by: MICHAEL S FRUCHTMAN <[email protected]>
msfrucht · Jun 25, 2024 · 04d37da · 04d37da
1 parent dbcc9e7
commit 04d37da
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/pkg/exposer/csi_snapshot.go b/pkg/exposer/csi_snapshot.go
@@ -32,17 +32,12 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/vmware-tanzu/velero/pkg/exposer/shallowprovisioner"
 	"github.com/vmware-tanzu/velero/pkg/nodeagent"
 	"github.com/vmware-tanzu/velero/pkg/util/boolptr"
 	"github.com/vmware-tanzu/velero/pkg/util/csi"
 	"github.com/vmware-tanzu/velero/pkg/util/kube"
 
-	shallowprovisioner "github.com/vmware-tanzu/velero/pkg/exposer/shallowprovisioner"
-
-	snapshotter "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
 // CSISnapshotExposeParam define the input param for Expose of CSI snapshots