resolve merge conflict hell

2014-12-14 20:57:29 +00:00
parent 4c89d5331f
commit 72290f67fe
4 changed files with 1 additions and 19 deletions
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@ -137,10 +137,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block {
 	return block
 }

-func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlock []byte) {
-	return self.TD, self.CurrentBlock.Hash(), self.Genesis().Hash()
-}
-
 func (bc *ChainManager) Reset() {
 	AddTestNetFunds(bc.genesisBlock)