Merge branch 'develop' into upstream

druxt · Sep 29, 2022 · 2abc900 · 2abc900
2 parents baefbc8 + 432e5a9
commit 2abc900
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/pull-upstream.yml b/.github/workflows/pull-upstream.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop
-      - feature/24-upstream_merge
 
 jobs:
   pull_upstream:
@@ -65,4 +64,4 @@ jobs:
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
 
       # - name: Setup upterm session
-      #   uses: lhotari/action-upterm@v1
+      #   uses: lhotari/action-upterm@v1