resolve conflicts

kubeshop · Aug 29, 2023 · 05ad57c · 05ad57c
2 parents 43bcec5 + 81feaaf
commit 05ad57c
Show file tree

Hide file tree

Showing 10 changed files with 266 additions and 181 deletions.
diff --git a/charts/testkube-cloud-api-1.13.88.tgz b/charts/testkube-cloud-api-1.13.88.tgz
diff --git a/charts/testkube-cloud-api-1.13.89.tgz b/charts/testkube-cloud-api-1.13.89.tgz
diff --git a/charts/testkube-cloud-api-1.13.90.tgz b/charts/testkube-cloud-api-1.13.90.tgz
diff --git a/charts/testkube-cloud-api-1.13.91.tgz b/charts/testkube-cloud-api-1.13.91.tgz
diff --git a/charts/testkube-cloud-api/.argocd-source-edge-testkube-cloud-api.yaml b/charts/testkube-cloud-api/.argocd-source-edge-testkube-cloud-api.yaml
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.4.0-dev-43cf94b
+    value: 1.4.0-dev-e589723
     forcestring: true
diff --git a/charts/testkube-cloud-ui-1.13.92.tgz b/charts/testkube-cloud-ui-1.13.92.tgz
diff --git a/charts/testkube-enterprise-1.12.33.tgz b/charts/testkube-enterprise-1.12.33.tgz
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-api-1.14.0.tgz b/charts/testkube-enterprise/charts/testkube-cloud-api-1.14.0.tgz
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-ui-1.13.79.tgz b/charts/testkube-enterprise/charts/testkube-cloud-ui-1.13.79.tgz
diff --git a/index.yaml b/index.yaml