Update Chart.yaml

marmila · Dec 19, 2023 · eec62b5 · eec62b5
1 parent 9f47ef8
commit eec62b5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/argocd/system/longhorn-system/Chart.yaml b/argocd/system/longhorn-system/Chart.yaml
@@ -5,7 +5,3 @@ dependencies:
   - name: longhorn
     version: 1.5.3
     repository: https://charts.longhorn.io
-<<<<<<< HEAD
-
-=======
->>>>>>> 6652336 (fix merge issues)