Skip to content

Commit

Permalink
Merge pull request #1591 from pi-hole/dependabot/github_actions/devel…
Browse files Browse the repository at this point in the history
…opment-v6/eps1lon/actions-label-merge-conflict-3.0.2

Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
  • Loading branch information
yubiuser authored Jun 1, 2024
2 parents be48e11 + 42fab87 commit 0f530a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/merge-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if PRs are have merge conflicts
uses: eps1lon/[email protected].1
uses: eps1lon/[email protected].2
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
Expand Down

0 comments on commit 0f530a6

Please sign in to comment.