From a448cff373fe3db8632703325af22ee4f896f22d Mon Sep 17 00:00:00 2001 From: Derek Su Date: Fri, 14 Feb 2025 15:34:39 +0800 Subject: [PATCH] fix: fix conflicts Signed-off-by: Derek Su --- csi/crypto/crypto.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/csi/crypto/crypto.go b/csi/crypto/crypto.go index 1d20371273..0e631636c1 100644 --- a/csi/crypto/crypto.go +++ b/csi/crypto/crypto.go @@ -10,12 +10,6 @@ import ( lhns "github.com/longhorn/go-common-libs/ns" lhtypes "github.com/longhorn/go-common-libs/types" -<<<<<<< HEAD -======= - longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2" - - "github.com/longhorn/longhorn-manager/types" ->>>>>>> 72c91734 (fix: data lost caused by Longhorn CSI plugin doing a wrong re-encryption of volume in rare) ) const (