From 614c12c5db0da406fd232cb9b0e82aec304a854e Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 21 May 2025 15:05:03 -0700 Subject: [PATCH] ci: fix tag for label merge conflicts (#1344) Link: https://github.com/nix-community/stylix/pull/1344 Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- .github/workflows/conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index 6e549a0d..1c922b91 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -19,7 +19,7 @@ jobs: private-key: ${{ secrets.APP_PRIVATE_KEY }} permission-contents: read permission-pull-requests: write - - uses: mschilde/auto-label-merge-conflicts@v2 + - uses: mschilde/auto-label-merge-conflicts@v2.0 with: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} CONFLICT_LABEL_NAME: "status: merge conflict"