Merge branch 'main' into ci/fix-ref-if-main

CIT-Autonomous-Robot-Lab · May 14, 2024 · 44d4eaa · 44d4eaa
2 parents 1707ffb + c6a8edb
commit 44d4eaa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -60,7 +60,11 @@ jobs:
             async function run() {
               const { owner, repo } = context.repo;
               const workflow_id = 'rerun.yml';
+<<<<<<< HEAD
               const ref = ('${{ github.head_ref }}' === '' || '${{ github.head_ref }}' === 'main') ? 'main' : '${{ github.head_ref }}';
+=======
+              const ref = ('${{ github.head_ref }}' === 'main') ? 'main' : '${{ github.head_ref }}';
+>>>>>>> main
               const run_id = context.runId;
 
               try {