fix conflicts

kubeshop · Sep 19, 2024 · de79f69 · de79f69
1 parent 0e84fa3
commit de79f69
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/charts/testkube-api/Chart.yaml b/charts/testkube-api/Chart.yaml
@@ -2,8 +2,13 @@ apiVersion: v2
 name: testkube-api
 description: A Helm chart for Testkube api
 type: application
+<<<<<<< HEAD
 version: 2.1.21
 appVersion: 2.1.21
+=======
+version: 2.1.20
+appVersion: 2.1.20
+>>>>>>> 3cd553e6 (Update Chart.yaml files)
 dependencies:
   - name: global
     version: 0.1.2