Merge continue 5

Not sure why the merge tool changed this file and removed that but it
did.
This commit is contained in:
Christopher Franko 2016-05-18 13:57:30 -04:00
parent 7c1130c237
commit 9c61f49cfd

View file

@ -19,6 +19,6 @@ package params
import "math/big"
var (
TestNetHomesteadBlock = big.NewInt(494000) // testnet homestead block
MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block
TestNetHomesteadBlock = big.NewInt(0) // testnet homestead block
MainNetHomesteadBlock = big.NewInt(200000) // mainnet homestead block
)