grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Nikolay Volf
2016-06-01 19:57:34 +02:00
parent 6676c6cf7e
commit c370bcaded
5 changed files with 12 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parity/rpc_apis.rs
View File

@@ -20,7 +20,7 @@ use std::sync::Arc;
use die::*;
use ethsync::EthSync;
use ethminer::{Miner, ExternalMiner};
use ethcore::miner::{Miner, ExternalMiner};
use ethcore::client::Client;
use util::RotatingLogger;
use util::keys::store::AccountService;