Skip to content

Commit c96fbcf

Browse files
authored
Update mergify-labels-copier.yml
1 parent c6678af commit c96fbcf

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/mergify-labels-copier.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ jobs:
1818
# See https://github.com/cli/cli/issues/6274
1919
repository-projects: read
2020
steps:
21-
<<<<<<< HEAD
22-
- uses: elastic/oblt-actions/mergify/labels-copier@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
23-
=======
2421
- uses: elastic/oblt-actions/mergify/labels-copier@v1
25-
>>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))
2622
with:
2723
excluded-labels-regex: "^backport-*"

0 commit comments

Comments
 (0)