Update rerun-flaky-workflows.yml (#2111)

elastic · Apr 9, 2024 · 6d7ac0f · 6d7ac0f
1 parent 3611691
commit 6d7ac0f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/rerun-flaky-workflows.yml b/.github/workflows/rerun-flaky-workflows.yml
@@ -60,11 +60,7 @@ jobs:
 
       - name: Slack Notification
         uses: ./.github/actions/slack-notification
-<<<<<<< HEAD
-        if: ${{ !cancelled() && failure() }} # Run only if the previous step failed
-=======
         if: ${{ !cancelled() && failure() && github.event.workflow_run.head_branch == 'main'}} # Run only if the previous step failed
->>>>>>> 61b21ecb (Update rerun workflow (#2089))
         continue-on-error: true
         env:
           BREAKING_COMMIT: "${{ github.event.workflow_run.head_sha }}"