From 359e961aa78de2cea6d79ec83ba708182804b8f8 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Thu, 23 May 2024 20:16:37 +0200 Subject: [PATCH] Fixed flipflopping between having `needs:resolve-merge-conflict` and not having `needs:resolve-merge-conflict` --- .github/workflows/conflict_labeler.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml index 10dd831aa..fdcc9c551 100644 --- a/.github/workflows/conflict_labeler.yml +++ b/.github/workflows/conflict_labeler.yml @@ -22,5 +22,4 @@ jobs: uses: eps1lon/actions-label-merge-conflict@v3 with: dirtyLabel: 'needs:resolve-merge-conflict' - removeOnDirtyLabel: 'needs:resolve-merge-conflict' repoToken: '${{ secrets.GITHUB_TOKEN }}'