From 6fa243c529e5bea2e7d3b83440485501e4018d7e Mon Sep 17 00:00:00 2001 From: avanish23 Date: Tue, 22 Oct 2024 21:15:40 +0530 Subject: [PATCH] fix conflict --- charts/kubernetes-dashboard/Chart.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/kubernetes-dashboard/Chart.yaml b/charts/kubernetes-dashboard/Chart.yaml index c0cb24f1e8d5..60ce29b87c72 100644 --- a/charts/kubernetes-dashboard/Chart.yaml +++ b/charts/kubernetes-dashboard/Chart.yaml @@ -14,11 +14,7 @@ apiVersion: v2 name: kubernetes-dashboard -<<<<<<< HEAD version: 7.9.0 -======= -version: 7.8.0 ->>>>>>> 0ea61afd6 (revert chart version bumpup) description: General-purpose web UI for Kubernetes clusters keywords: - kubernetes