From 3a0f4e399341bf56e20ee911a427b6180601a52b Mon Sep 17 00:00:00 2001
From: Simon Schmell <simon.sc@exodus.io>
Date: Fri, 26 Jan 2024 08:54:14 +0100
Subject: [PATCH] chore: remove conflicts workflow

---
 .github/workflows/conflicts.yaml | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 .github/workflows/conflicts.yaml

diff --git a/.github/workflows/conflicts.yaml b/.github/workflows/conflicts.yaml
deleted file mode 100644
index dc273daa..00000000
--- a/.github/workflows/conflicts.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Rebase Conflicts
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [synchronize]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  conflicts:
-    name: Check for Conflicts
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label PRs
-        uses: ExodusMovement/actions-label-merge-conflict@71abef2871620db9447045b06bcd150ed607dc13
-        with:
-          dirtyLabel: 'blocked/needs-rebase'
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          commentOnDirty: 'Houston, this is Conflict Bot. We have a conflict. I repeat, we have a conflict. @<%= author %> please rebase. Acknowledge.'
-          retryAfter: 45
-          removeDirtyComment: true