Diff comments:
> diff --git a/Makefile b/Makefile
> index 53fc526..8215f4c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -189,8 +189,13 @@ lint-oapi: openapi.yaml
> .PHONY: lint-oapi
>
> # Go fmt
> +<<<<<<< Makefile
seems like a merge conflict got committed?
> lint-go: $(BIN_DIR)/golangci-lint
> @find src -maxdepth 3 -type f -name go.mod -execdir golangci-lint run
> -v ./... \; | \
> +=======
> +lint-go:
> + @find src -type f -name go.mod -maxdepth 3 -execdir golangci-lint run
> ./... \; | \
> +>>>>>>> Makefile
> tee /tmp/golangci-lint.lint
> @test ! -s /tmp/golangci-lint.lint
> .PHONY: lint-go
--
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442035
Your team MAAS Committers is subscribed to branch maas:master.
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : [email protected]
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
