From cb4a2d5f917a4fd9ec1a51e6ecc9be32ba093509 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Thu, 6 Aug 2020 21:39:35 +0530
Subject: [PATCH] chore(tools): remove merge-conflict action

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

diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
deleted file mode 100644
index b1253510ae..0000000000
--- a/.github/workflows/label_merge_conflicts.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Check for merge conflicts'
-on:
-  schedule:
-    # run this Action every 12 hours
-    - cron:  '0 */12 * * *'
-jobs:
-  triage:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: 'status: merge conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}