From e5f459bd52660e60ed90badbb7f7de2a8cc06001 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 17 Aug 2020 13:57:58 -0500
Subject: [PATCH] ci: remove merge conflict notifier job.

Seems to be broken and it's not worth debugging.
---
 .github/workflows/test.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4dd39cc50..564c97755 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,16 +10,6 @@ on:
     - master
 
 jobs:
-  # https://github.com/Marr11317/ConflictAdviser
-  notify-merge-conflicts:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: Marr11317/ConflictAdviser@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          conflict_label: "merge conflict"
-          comment: 'Rebase needed'
-
   test:
     runs-on: ubuntu-latest
     container: ubuntu:20.04