Merge conflicts

2014-03-17 10:41:05 +01:00
parent 8ea7e21f64 b15a4985e8
commit 095d5baaed
3 changed files with 29 additions and 27 deletions
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -235,11 +235,11 @@ func (pool *TxPool) Start() {
 }

 func (pool *TxPool) Stop() {
-	log.Println("[TXP] Stopping...")
-
 	close(pool.quit)

 	pool.Flush()
+
+	log.Println("[TXP] Stopped")
 }

 func (pool *TxPool) Subscribe(channel chan TxMsg) {