fix(jellifyn): Fix the jellyfin chart to avoid errors when using the extra LB

umbertix · umbertix · commit ad9f19dd1a37 · 2024-04-02T22:30:25.000+02:00
diff --git a/helm-charts/k8s-mediaserver/Chart.yaml b/helm-charts/k8s-mediaserver/Chart.yaml
@@ -1,6 +1,14 @@
 apiVersion: v2
+<<<<<<< HEAD
 appVersion: 0.10.2
 description: A Helm chart for Kubernetes mediaserver
 name: k8s-mediaserver
 type: application
 version: 0.10.2
+=======
+appVersion: 0.10.1
+description: A Helm chart for Kubernetes mediaserver
+name: k8s-mediaserver
+type: application
+version: 0.10.1
+>>>>>>> 50d4b839cb685a64d6718b869e3da5be00d11a6f
