fix: fix typo

Signed-off-by: Arthur Le Roux <[email protected]>
prometheus-community · Jan 29, 2024 · cc71b54 · cc71b54
1 parent 6f17b5f
commit cc71b54
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/charts/prometheus-systemd-exporter/Chart.yaml b/charts/prometheus-systemd-exporter/Chart.yaml
@@ -2,11 +2,7 @@ apiVersion: v2
 name: prometheus-systemd-exporter
 description: A Helm chart for prometheus systemd-exporter
 type: application
-<<<<<<< HEAD
-version: 0.1.1
-=======
 version: 0.2.0
->>>>>>> 83863b25 (feat(systemd-exporter): allow mount extraVolumes)
 appVersion: "0.6.0"
 home: https://github.com/prometheus-community/systemd_exporter
 sources: