resolve version conflict
This commit is contained in:
parent
5de49e53bc
commit
20640c0622
@ -37,11 +37,7 @@ func BuildTypeString() string {
|
||||
}
|
||||
|
||||
// BuildVersion is the local build version
|
||||
<<<<<<< HEAD
|
||||
const BuildVersion = "1.26.3"
|
||||
=======
|
||||
const BuildVersion = "1.27.0-dev"
|
||||
>>>>>>> tags/v1.27.0-rc1
|
||||
|
||||
func UserVersion() string {
|
||||
if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {
|
||||
|
Loading…
Reference in New Issue
Block a user