fix conflict

kubernetes · Oct 22, 2024 · 6fa243c · 6fa243c
1 parent 0d5f653
commit 6fa243c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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