Merge tag '0.18.16' into firmware22

1 files changed, 0 insertions, 35 deletions

diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
deleted file mode 100644
index 98d3616ad1..0000000000
--- a/.github/workflows/feature_branch_update.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Update feature branches after develop merge
-
-on:
-  push:
-    branches:
-    - develop
-
-jobs:
-  feature_branch_update:
-    runs-on: ubuntu-latest
-
-    if: github.repository == 'qmk/qmk_firmware'
-
-    strategy:
-      matrix:
-        branch:
-        - xap
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        token: ${{ secrets.QMK_BOT_TOKEN }}
-        fetch-depth: 0
-
-    - name: Checkout branch
-      run: |
-        git fetch origin develop ${{ matrix.branch }}
-        git checkout ${{ matrix.branch }}
-
-    - name: Update branch from develop
-      run: |
-        git config --global user.name "QMK Bot"
-        git config --global user.email "hello@qmk.fm"
-        git merge origin/develop
-        git push origin ${{ matrix.branch }}