From 9db4a14176efc5392cc30cf09cec3bcfc5284090 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Tue, 1 Sep 2015 18:59:44 -0400 Subject: [PATCH] update backend --- exp/backend.go | 1 - 1 file changed, 1 deletion(-) diff --git a/exp/backend.go b/exp/backend.go index fe607f64ec..a2b50efebf 100644 --- a/exp/backend.go +++ b/exp/backend.go @@ -370,7 +370,6 @@ func New(config *Config) (*Expanse, error) { } exp.txPool = core.NewTxPool(exp.EventMux(), exp.chainManager.State, exp.chainManager.GasLimit) -<<<<<<< HEAD:exp/backend.go exp.blockProcessor = core.NewBlockProcessor(chainDb, exp.pow, exp.chainManager, exp.EventMux()) exp.chainManager.SetProcessor(exp.blockProcessor) exp.protocolManager = NewProtocolManager(config.NetworkId, exp.eventMux, eth.txPool, exp.pow, exp.chainManager)