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

Merge branch 'master' into signer-rpc

Browse Source 
Conflicts:
	dapps/src/lib.rs
	parity/main.rs
	parity/signer.rs
	signer/Cargo.toml
	signer/src/lib.rs
This commit is contained in:
Tomasz Drwięga 2016-05-28 19:34:42 +02:00
commit d74fc2c285
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parity/main.rs
View File

@ -53,8 +53,6 @@ extern crate ethcore_dapps;
#[cfg(feature = "ethcore-signer")] #[cfg(feature = "ethcore-signer")]
extern crate ethcore_signer; extern crate ethcore_signer;
#[macro_use] #[macro_use]
mod die; mod die;
mod price_info; mod price_info;