From 5c64859a9baa2242484b35cdf16966c3bf42480f Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <kubuxu@protocol.ai>
Date: Tue, 17 Dec 2019 02:50:52 +0100
Subject: [PATCH] Fix merge conflict

Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
---
 build/version.go | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/build/version.go b/build/version.go
index 05ca42c48..1a4f5bfd5 100644
--- a/build/version.go
+++ b/build/version.go
@@ -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