Skip to content

Commit 03c18f3

Browse files
authored
Update microbenchmark.yml
1 parent aa08633 commit 03c18f3

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
@@ -23,11 +23,7 @@ jobs:
2323
timeout-minutes: 5
2424
steps:
2525
- name: Run buildkite pipeline
26-
<<<<<<< HEAD
27-
uses: elastic/oblt-actions/buildkite/run@9a8ac45080b2f079246e2a0c665b551c6986b6c3 # v1.9.1
28-
=======
2926
uses: elastic/oblt-actions/buildkite/run@v1
30-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
3127
with:
3228
token: ${{ secrets.BUILDKITE_TOKEN }}
3329
pipeline: apm-agent-microbenchmark

0 commit comments

Comments
 (0)