fix 2

2026-01-12 09:15:03 +01:00
parent 9431572008
commit d092565e78
1 changed files with 0 additions and 4 deletions
--- a/.woodpecker/namespace.yml
+++ b/.woodpecker/namespace.yml
@@ -3,11 +3,7 @@ when:
  ref:
    exclude:
      - refs/tags/*-configchange
-<<<<<<< HEAD
-      
-=======

->>>>>>> main
 steps:
  create_namespace:
    image: quay.io/wollud1969/k8s-admin-helper:0.3.4