fix conflicts

go-vela · Aug 14, 2024 · 960b41b · 960b41b
1 parent 04611b3
commit 960b41b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,17 +13,10 @@ jobs:
 
     steps:
     - name: clone
-<<<<<<< HEAD
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: install go
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-=======
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-
-    - name: install go
-      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
->>>>>>> 8a0ce30b7d5ca6644bc2a0ce0d715981767a2329
       with:
         # use version from go.mod file
         go-version-file: 'go.mod'
@@ -35,11 +28,7 @@ jobs:
         go test -race -covermode=atomic -coverprofile=coverage.out ./...
 
     - name: coverage
-<<<<<<< HEAD
       uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
-=======
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4
->>>>>>> 8a0ce30b7d5ca6644bc2a0ce0d715981767a2329
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: coverage.out
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -17,7 +17,6 @@ jobs:
 
     - name: install go
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-      with:
       with:
         # use version from go.mod file
         go-version-file: 'go.mod'