cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

resolve version conflict

Browse Source
This commit is contained in:
jonathan@vulcanize.io 2024-05-02 18:55:32 +00:00
parent 5de49e53bc
commit 20640c0622
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/version.go
View File

@ -37,11 +37,7 @@ func BuildTypeString() string {
} }
// BuildVersion is the local build version // BuildVersion is the local build version
<<<<<<< HEAD
const BuildVersion = "1.26.3"
=======
const BuildVersion = "1.27.0-dev" const BuildVersion = "1.27.0-dev"
>>>>>>> tags/v1.27.0-rc1
func UserVersion() string { func UserVersion() string {
if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" { if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {