From 86a8b0ad07f0e78968575ea5e4cf46216fbfe6eb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 2 Apr 2022 22:09:16 +0100
Subject: [PATCH] Automatically approve workflow runs from first time
 contributors (#16774)

---
 .github/workflows/auto_approve.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
index dea3f017ddd9..d4ca5a47ded3 100644
--- a/.github/workflows/auto_approve.yml
+++ b/.github/workflows/auto_approve.yml
@@ -8,6 +8,7 @@ jobs:
   automatic_approve:
     runs-on: ubuntu-latest
 
+<<<<<<< HEAD
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
@@ -16,3 +17,11 @@ jobs:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         workflows: "format.yml,lint.yml,unit_test.yml"
         dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
+=======
+    steps:
+        uses: mheap/automatic-approve-action@v1
+        with:
+          token: ${{ secrets.QMK_BOT_TOKEN }}
+          workflows: "format.yml,lint.yml,unit_test.yml"
+          dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
+>>>>>>> bebccd1fd0 (Automatically approve workflow runs from first time contributors (#16774))