reoslve conflicts after rebase

tkcontiant · tkcontiant · commit c00cf3596695 · 2025-09-25T18:35:18.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,7 @@ kubeconfig
 
 .gomodcache
 .gocache
+
+# helm template output temporary files
+/**/out
+out
