reoslve conflicts after rebase

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