Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ksclarke committed Mar 3, 2025
2 parents 2f97972 + 68550d3 commit c5fa908
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ your system's documentation or package system for more details.
* The [golangci-lint](https://github.com/golangci/golangci-lint) linter for checking code style conformance

Optionally, if you want to test (or build using) the project's GitHub Actions:

* [ACT](https://github.com/nektos/act): A local GitHub Action runner that will also build and test the project

## Building and Running with Make
Expand Down

0 comments on commit c5fa908

Please sign in to comment.