diff --git a/.github/actions/check-merge-conflict/action.yml b/.github/actions/check-merge-conflict/action.yml index 7ffd686c9..75fec81d3 100644 --- a/.github/actions/check-merge-conflict/action.yml +++ b/.github/actions/check-merge-conflict/action.yml @@ -5,8 +5,8 @@ runs: using: composite steps: - name: Check for merge conflict - # releases/2.1.0 - uses: eps1lon/actions-label-merge-conflict@92924ba33a60e436034b0ac3838de523bf7df071 + # v3.0.2 + uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 with: repoToken: ${{ env.GITHUB_TOKEN }} commentOnDirty: This pull request has merge conflicts. Please resolve those before requesting a review.