Skip to content

Commit 2bcee9d

Browse files
authored
Update microbenchmark.yml
1 parent 39a8624 commit 2bcee9d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/microbenchmark.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ jobs:
2222
timeout-minutes: 5
2323
steps:
2424
- name: Run buildkite pipeline
25-
<<<<<<< HEAD
26-
uses: elastic/oblt-actions/buildkite/run@9a8ac45080b2f079246e2a0c665b551c6986b6c3 # v1.9.1
27-
=======
2825
uses: elastic/oblt-actions/buildkite/run@v1
29-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
3026
with:
3127
token: ${{ secrets.BUILDKITE_TOKEN }}
3228
pipeline: apm-agent-microbenchmark

0 commit comments

Comments
 (0)