From 72290f67fee2be183981c9672d830040466187bd Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 14 Dec 2014 20:57:29 +0000
Subject: resolve merge conflict hell

---
 core/chain_manager.go | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'core')

diff --git a/core/chain_manager.go b/core/chain_manager.go
index 9ed2c1c42..f9fb3b3f8 100644
--- 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)
 
-- 
cgit v1.2.3