Merge branch 'signer-rpc' into signer-signing

2016-05-28 19:40:34 +02:00 · 2016-05-28 19:40:34 +02:00 · f339b6a491
commit f339b6a491
parent d4e66ba52f d74fc2c285
2 changed files with 3 additions and 5 deletions
--- a/parity/main.rs
+++ b/parity/main.rs
@ -53,8 +53,6 @@ extern crate ethcore_dapps;
 #[cfg(feature = "ethcore-signer")]
 extern crate ethcore_signer;

-
-
 #[macro_use]
 mod die;
 mod price_info;