merge upstream fork

codefresh-io · Jan 31, 2024 · da0d8e1 · da0d8e1
1 parent d2f6bd7
commit da0d8e1
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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