Apply suggestions from code review

elastic · Jul 1, 2024 · 35b94c8 · 35b94c8
1 parent ce31d4c
commit 35b94c8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml
@@ -75,7 +75,6 @@ jobs:
       - run: make patch-release
 
       - if: success()
-<<<<<<< HEAD
         uses: elastic/oblt-actions/slack/send@v1
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}