Skip to content

Commit

Permalink
Fixed merge conflict from Bump actions/checkout from 4.1.1 to 4.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
hspencer77 committed Apr 30, 2024
1 parent 9a4deed commit 7e0a75d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

name: test-and-build

on:
Expand Down Expand Up @@ -98,3 +99,4 @@ jobs:
- name: build
run: |
PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker check-build-image-manifest-up-to-date

0 comments on commit 7e0a75d

Please sign in to comment.