fix: merge conflict

Signed-off-by: william.vanhevelingen <[email protected]>
argoproj · Sep 15, 2024 · 5ae2e7a · 5ae2e7a
1 parent e56e4af
commit 5ae2e7a
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 0 deletions.
diff --git a/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml b/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml
diff --git a/manifests/base/crds/full/argoproj.io_cronworkflows.yaml b/manifests/base/crds/full/argoproj.io_cronworkflows.yaml
diff --git a/manifests/base/crds/full/argoproj.io_workflowartifactgctasks.yaml b/manifests/base/crds/full/argoproj.io_workflowartifactgctasks.yaml
diff --git a/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml b/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml