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

Fix merge conflict

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera
2019-12-17 02:50:52 +01:00
parent 17d0fe96a4
commit 5c64859a9b
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/version.go
+2 -17
View File
@@ -25,28 +25,13 @@ func (ve Version) String() string {
vmj, vmi, vp := ve.Ints()
return fmt.Sprintf("%d.%d.%d", vmj, vmi, vp)
}
>>>>>>> 4041819c... Refactor versions
func (ve Version) EqMajorMinor(v2 Version) bool {
return ve&minorMask == v2&minorMask
}
// APIVersion is a hex semver version of the rpc api exposed
//
// M M P
// A I A
// J N T
// O O C
// R R H
// |\vv/|
// vv vv
<<<<<<< HEAD
const APIVersion = 0x000102
||||||| parent of 4041819c... Refactor versions
const APIVersion = 0x000101
=======
var APIVersion Version = newVer(0, 1, 1)
>>>>>>> 4041819c... Refactor versions
// APIVersion is a semver version of the rpc api exposed
var APIVersion Version = newVer(0, 1, 2)
const (
majorMask = 0xff0000