From e99849e1fc75b46611e2ed5ee80c2ab617e2f489 Mon Sep 17 00:00:00 2001
From: Colin Edwards <colin@recursivepenguin.com>
Date: Tue, 3 Mar 2020 20:23:25 -0600
Subject: [PATCH] CI: Remove merge conflict bot for now

---
 .github/workflows/main.yml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 3be16ed12..000000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: "Has Conflicts"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}