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

Merge branch 'master' into sfedgecase

Browse Source
This commit is contained in:
Gav Wood
2016-06-23 14:43:42 +02:00
parent 41e0769e63 082294fe81
commit bca9e1f31a
17 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parity/main.rs
View File

@@ -547,7 +547,7 @@ fn execute_account_cli(conf: Configuration) {
}
fn execute_wallet_cli(conf: Configuration) {
use ethcore::ethstore::{PresaleWallet, SecretStore, EthStore};
use ethcore::ethstore::{PresaleWallet, EthStore};
use ethcore::ethstore::dir::DiskDirectory;
use ethcore::account_provider::AccountProvider;