Maran ee5e7f2b35 Fix merge conflict

2014-04-01 13:18:42 +02:00

..

config.go

Moved node to ethereum

2014-03-22 12:03:10 +01:00

dev_console.go

Updated to new mutan api

2014-03-30 22:03:29 +02:00

ethereum.go

Fixed miner

2014-03-31 01:02:00 +02:00