From 590bcb448ef741b826e50ce06f219fc1a2a0d3c1 Mon Sep 17 00:00:00 2001
From: MestryOmkar <mestryomkar@gmail.com>
Date: Tue, 4 Dec 2018 10:09:52 +0530
Subject: [PATCH] resolve conflicts

---
 common/types.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/types.go b/common/types.go
index e61a994c13..8e966a7ac5 100644
--- a/common/types.go
+++ b/common/types.go
@@ -30,11 +30,16 @@ import (
 const (
 	HashLength          = 32
 	AddressLength       = 20
-	MasternodeVotingSMC = "0x0000000000000000000000000000000000000088"
 	BlockSigners        = "0x0000000000000000000000000000000000000089"
+	MasternodeVotingSMC = "0x0000000000000000000000000000000000000088"
 	RandomizeSMC        = "0x0000000000000000000000000000000000000090"
 	FoudationAddr       = "0x0000000000000000000000000000000000000068"
 	TeamAddr            = "0x0000000000000000000000000000000000000099"
+	VoteMethod          = "0x6dd7d8ea"
+	UnvoteMethod        = "0x02aa9be2"
+	ProposeMethod       = "0x01267951"
+	ResignMethod        = "0xae6e43f5"
+	SignMethod          = "0xe341eaa4"
 )
 
 var (
@@ -45,6 +50,11 @@ var (
 // Hash represents the 32 byte Keccak256 hash of arbitrary data.
 type Hash [HashLength]byte
 
+type Vote struct {
+	Masternode Address
+	Voter      Address
+}
+
 func BytesToHash(b []byte) Hash {
 	var h Hash
 	h.SetBytes(b)
@@ -281,4 +291,4 @@ func ExtractAddressFromBytes(bytePenalties []byte) []Address {
 		copy(penalties[i][:], bytePenalties[i*AddressLength:])
 	}
 	return penalties
-}
+}
\ No newline at end of file