From f73586935075a17764abdc1052842e478c61d563 Mon Sep 17 00:00:00 2001 From: Ivan Zosimov Date: Tue, 26 Apr 2022 13:25:24 +0200 Subject: [PATCH] Fix merge confilct in README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 4d497f6..a2999a1 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,8 @@ The V3 edition of the action offers: - Adds `GOBIN` to the `PATH` - Proxy support - Check latest version -<<<<<<< HEAD - Caching packages dependencies - Bug Fixes (including issues around version matching and semver) -======= -- Bug fixes (including issues around version matching and semver) ->>>>>>> main The action will first check the local cache for a version match. If a version is not found locally, it will pull it from the `main` branch of the [go-versions](https://github.com/actions/go-versions/blob/main/versions-manifest.json) repository. On miss or failure, it will fall back to downloading directly from [go dist](https://storage.googleapis.com/golang). To change the default behavior, please use the [check-latest input](#check-latest-version).