merge

Zondax · Feb 2, 2024 · 0bd324b · 0bd324b
2 parents eb1d237 + 969cd72
commit 0bd324b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/checks.golang.yml b/.github/workflows/checks.golang.yml
@@ -11,9 +11,6 @@ on:
 
 jobs:
   checks:
-<<<<<<< HEAD
-    runs-on: [self-hosted, linux, x64]
-=======
     runs-on: zondax-runners
     container:
       image: golang:1.20
@@ -24,7 +21,6 @@ jobs:
         ports:
           - "4222:4222"
           - "5530:5530"
->>>>>>> 969cd72 (move to new runners)
     steps:
       - name: Checkout
         uses: actions/checkout@v3