From 74c4a3644ecbaccf063fcba3e4a0d7eb336a215f Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Tue, 11 Apr 2023 08:17:32 +0800 Subject: [PATCH] fix: merfigy conflict Signed-off-by: Chin-Ya Huang --- deploy/longhorn-images.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/deploy/longhorn-images.txt b/deploy/longhorn-images.txt index e525097..aca5642 100644 --- a/deploy/longhorn-images.txt +++ b/deploy/longhorn-images.txt @@ -4,20 +4,10 @@ longhornio/csi-resizer:v1.3.0 longhornio/csi-snapshotter:v5.0.1 longhornio/csi-node-driver-registrar:v2.5.0 longhornio/livenessprobe:v2.8.0 -<<<<<<< HEAD longhornio/backing-image-manager:v1.4.1 longhornio/longhorn-engine:v1.4.1 longhornio/longhorn-instance-manager:v1.4.1 longhornio/longhorn-manager:v1.4.1 longhornio/longhorn-share-manager:v1.4.1 longhornio/longhorn-ui:v1.4.1 -longhornio/support-bundle-kit:v0.0.20 -======= -longhornio/backing-image-manager:master-head -longhornio/longhorn-engine:master-head -longhornio/longhorn-instance-manager:master-head -longhornio/longhorn-manager:master-head -longhornio/longhorn-share-manager:master-head -longhornio/longhorn-ui:master-head longhornio/support-bundle-kit:v0.0.22 ->>>>>>> 54e6163 (chore(support-bundle): version bump)