From 68ff602391bb91598618a2b15d64d636fb9e8ce8 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 7 May 2019 15:25:11 +0530 Subject: [PATCH] Resolve merge conflict Signed-off-by: Humble Chirammal --- deploy/cephfs/helm/Chart.yaml | 4 ---- deploy/rbd/helm/Chart.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/deploy/cephfs/helm/Chart.yaml b/deploy/cephfs/helm/Chart.yaml index 35fd2dd91..dc94bb2af 100644 --- a/deploy/cephfs/helm/Chart.yaml +++ b/deploy/cephfs/helm/Chart.yaml @@ -4,11 +4,7 @@ appVersion: "1.0.0" description: "Container Storage Interface (CSI) driver, provisioner, and attacher for Ceph cephfs" name: ceph-csi-cephfs -<<<<<<< HEAD version: 0.6.0 -======= -version: 0.5.3 ->>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785 keywords: - ceph - cephfs diff --git a/deploy/rbd/helm/Chart.yaml b/deploy/rbd/helm/Chart.yaml index 15debafe0..a36450e34 100644 --- a/deploy/rbd/helm/Chart.yaml +++ b/deploy/rbd/helm/Chart.yaml @@ -4,11 +4,7 @@ appVersion: "1.0.0" description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, and attacher for Ceph RBD" name: ceph-csi-rbd -<<<<<<< HEAD version: 0.6.0 -======= -version: 0.5.3 ->>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785 keywords: - ceph - rbd