Skip to content

Commit d6c994a

Browse files
authored
Update run-patch-release.yml
1 parent f57dddb commit d6c994a

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ jobs:
7171
# GitHub bot won't trigger any CI builds.
7272
# See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081
7373
- name: Configure git user
74-
<<<<<<< HEAD
75-
uses: elastic/oblt-actions/git/setup@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
76-
=======
7774
uses: elastic/oblt-actions/git/setup@v1
78-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
7975
with:
8076
github-token: ${{ steps.get_token.outputs.token }}
8177

@@ -92,11 +88,7 @@ jobs:
9288
GH_TOKEN: ${{ steps.get_token.outputs.token }}
9389

9490
- if: success()
95-
<<<<<<< HEAD
96-
uses: elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
97-
=======
9891
uses: elastic/oblt-actions/slack/send@v1
99-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
10092
with:
10193
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
10294
channel-id: ${{ env.SLACK_CHANNEL }}
@@ -106,11 +98,7 @@ jobs:
10698
thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }}
10799

108100
- if: failure()
109-
<<<<<<< HEAD
110-
uses: elastic/oblt-actions/slack/send@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
111-
=======
112101
uses: elastic/oblt-actions/slack/send@v1
113-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
114102
with:
115103
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
116104
channel-id: ${{ env.SLACK_CHANNEL }}

0 commit comments

Comments
 (0)