Skip to content

Commit

Permalink
Checking where the deprecation warning is coming from
Browse files Browse the repository at this point in the history
  • Loading branch information
Piedone committed Oct 26, 2022
1 parent 940ca14 commit 79951ee
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions .github/actions/check-merge-conflict/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,3 @@ runs:
steps:
# v2.2
- uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b
- name: Check for merge conflict
# releases/2.x
uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919
with:
repoToken: ${{ env.GITHUB_TOKEN }}
commentOnDirty: "This pull request has merge conflicts. Please resolve those before requesting a review."
dirtyLabel: "Merge Conflict"

0 comments on commit 79951ee

Please sign in to comment.