fixing rebasing error

gnolang · Sep 26, 2024 · 4a39a6a · 4a39a6a
1 parent 62079f1
commit 4a39a6a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/benchmark_template.yml b/.github/workflows/benchmark_template.yml
@@ -25,10 +25,6 @@ env:
 
 jobs:
   benchmarks:
-<<<<<<< Updated upstream
-    if: ${{ github.repository == 'sw360cab/gno' }}
-    runs-on: [self-hosted, Linux, X64, benchmarks]
-=======
     if: ${{ github.repository == 'gnolang/gno' }}
     runs-on: [self-hosted, Linux, X64, "${{ inputs.runner-additional-tag }}"]
     steps: