From c18a25654abe03ffd4b4581b249ff9cfe53da9a9 Mon Sep 17 00:00:00 2001 From: doublechest <114690331+doublechest0@users.noreply.github.com> Date: Mon, 1 Jul 2024 00:30:18 +0300 Subject: [PATCH] Update conflict-labeler.yml --- .github/workflows/conflict-labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 1e2125c30a..2fe32213bc 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -16,6 +16,6 @@ jobs: - name: Check for Merge Conflicts uses: eps1lon/actions-label-merge-conflict@v3.0.0 with: - dirtyLabel: "Merge Conflict" + dirtyLabel: "PR: Конфликты" repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."