Update merge conflict labelling action

Have been seeing some errors, hopefully this will fix.
cctbx · Aug 16, 2024 · 8a4a846 · 8a4a846
1 parent 9a8cff3
commit 8a4a846
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml
@@ -15,10 +15,7 @@ jobs:
 
     steps:
     - name: Label Conflicting Pull Requests
-      uses: eps1lon/actions-label-merge-conflict@72a2cf9eb9640428abbd99bc0aa6dd522073b9d3
-            # This is tagged version v1.2.3, but do not use version tags
-            # https://julienrenaux.fr/2019/12/20/github-actions-security-risk/
+      uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168
       with:
         dirtyLabel: "PR: merge conflicts"
-        removeOnDirtyLabel: "PR: ready to ship"
         repoToken: ${{ secrets.GITHUB_TOKEN }}