From da0d8e1b945a984ff36cb13458049e9ab7199490 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Wed, 31 Jan 2024 15:47:00 +0300 Subject: [PATCH] merge upstream fork --- .github/CODEOWNERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ea5fec8b2..c0d0ab9db 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,10 +2,5 @@ /charts/argo-workflows/ @vladlosev @jmeridth @yu-croco @tico24 /charts/argo-cd/ @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil @tico24 -<<<<<<< HEAD -/charts/argo-events/ @pdrastil @jmeridth @tico24 -/charts/argo-rollouts/ @jmeridth -======= /charts/argo-events/ @pdrastil @jmeridth @tico24 @yu-croco /charts/argo-rollouts/ @jmeridth @yu-croco ->>>>>>> upstream/main