mirror of
https://github.com/pi-hole/docker-pi-hole.git
synced 2024-07-05 23:51:00 +02:00
Merge pull request #1591 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
This commit is contained in:
commit
0f530a6ee6
2
.github/workflows/merge-conflict.yml
vendored
2
.github/workflows/merge-conflict.yml
vendored
|
@ -13,7 +13,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check if PRs are have merge conflicts
|
- name: Check if PRs are have merge conflicts
|
||||||
uses: eps1lon/actions-label-merge-conflict@v3.0.1
|
uses: eps1lon/actions-label-merge-conflict@v3.0.2
|
||||||
with:
|
with:
|
||||||
dirtyLabel: "Merge Conflict"
|
dirtyLabel: "Merge Conflict"
|
||||||
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user