conflicts in gha resolve

Author: ilia-medvedev-codefresh

.github/workflows/lint-and-test.yml

@@ -18,13 +18,6 @@ jobs:
         uses: azure/setup-helm@v3
         with:
           version: v3.10.1 # Also update in publish.yaml
-<<<<<<< HEAD
-
-      - name: Setup Kubectl
-        uses: azure/setup-kubectl@v3
-        id: install
-=======
->>>>>>> argo-events-2.0.9
 
       - name: Set up python
         uses: actions/setup-python@v4
@@ -69,18 +62,6 @@ jobs:
         with:
           config: .github/configs/kind-config.yaml
 
-<<<<<<< HEAD
-=======
-      - name: Deploy latest ArgoCD CRDs when testing ArgoCD extensions
-        if: |
-          contains(steps.list-changed.outputs.changed_charts, 'argocd-image-updater') ||
-          contains(steps.list-changed.outputs.changed_charts, 'argocd-apps')
-        run: |
-          helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
-          helm dependency build charts/argo-cd/
-          helm template charts/argo-cd/ --set server.extensions.enabled=true -s templates/crds/* | kubectl apply -f -
-
->>>>>>> argo-events-2.0.9
       - name: Skip HPA tests of ArgoCD
         if: contains(steps.list-changed.outputs.changed_charts, 'argo-cd')
         run: |

.github/workflows/publish.yml

@@ -8,9 +8,6 @@ on:
 permissions:
   contents: read
 
-permissions:
-  contents: read
-
 jobs:
   publish:
     permissions:
@@ -34,23 +31,15 @@ jobs:
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "[email protected]"
-<<<<<<< HEAD
-      - name: Package chart
-=======
 
       ## This is required to consider the old Circle-CI Index and to stay compatible with all the old releases.
       - name: Fetch current Chart Index
->>>>>>> argo-events-2.0.9
         run: |
           rm -rf .cr-release-packages
           mkdir .cr-release-packages
           helm package charts/argo-events -u -d .cr-release-packages/
       - name: Run chart-releaser
-<<<<<<< HEAD
-        uses: helm/chart-releaser-action@main
-=======
         uses: helm/[email protected]
->>>>>>> argo-events-2.0.9
         with:
           config: "./.github/configs/cr.yaml"
           skip_packaging: true