Merge pull request #865 from OpenShot/dependabot/github_actions/eps1lon/actions-label-merge-conflict-2.1.0

Bump eps1lon/actions-label-merge-conflict from 2.0.1 to 2.1.0

Author: jonoomph

.github/workflows/label-merge-conflicts.yml

@@ -14,7 +14,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@v2.0.1
+      - uses: eps1lon/actions-label-merge-conflict@v2.1.0
         with:
           # Token for the repository. Can be passed in using {{ secrets.GITHUB_TOKEN }}
           repoToken: ${{ secrets.GITHUB_TOKEN }}