Skip to content

Commit 80bafb6

Browse files
authored
Update run-minor-release.yml
1 parent 03c18f3 commit 80bafb6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/run-minor-release.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ jobs:
4848
contents: write
4949
steps:
5050

51-
<<<<<<< HEAD
52-
- uses: elastic/oblt-actions/slack/send@9a8ac45080b2f079246e2a0c665b551c6986b6c3 # v1.9.1
53-
=======
5451
- uses: elastic/oblt-actions/slack/send@v1
55-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
5652
with:
5753
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
5854
channel-id: ${{ env.SLACK_CHANNEL }}

0 commit comments

Comments
 (0)