merged

2026-01-12 09:12:07 +01:00
parent 61b9437b71 474b41ffce
commit a4bfa265b9
3 changed files with 27 additions and 13 deletions
--- a/.woodpecker/namespace.yml
+++ b/.woodpecker/namespace.yml
@@ -3,7 +3,11 @@ when:
  ref:
    exclude:
      - refs/tags/*-configchange
+<<<<<<< HEAD
      
+=======
+
+>>>>>>> main
 steps:
  create_namespace:
    image: quay.io/wollud1969/k8s-admin-helper:0.3.4