Skip to content

Commit

Permalink
Merge pull request #5 from amylizzle/testflip
Browse files Browse the repository at this point in the history
test2
  • Loading branch information
amylizzle authored Feb 9, 2024
2 parents ea6eadc + 1ddafb7 commit 6a60b6f
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ jobs:
Label:
runs-on: ubuntu-latest
steps:
- name: Apply Size Label
if: github.ref != 'refs/heads/master'
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Check for Merge Conflicts
uses: eps1lon/actions-label-merge-conflict@513a24fc7dca40990863be2935e059e650728400
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
- name: Apply Size Label
if: github.ref != 'refs/heads/master'
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

0 comments on commit 6a60b6f

Please sign in to comment.