fix: fix conflicts

Signed-off-by: Derek Su <derek.su@suse.com>
longhorn · Feb 14, 2025 · a448cff · a448cff
1 parent 4a2e448
commit a448cff
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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 (