merged conflicts manually

2019-10-21 22:32:32 +02:00
parent 813ba56b8e 654f526918
commit 05ba67882c
8 changed files with 73 additions and 19 deletions
--- a/lib/src/lightwallet.rs
+++ b/lib/src/lightwallet.rs
@@ -39,7 +39,6 @@ use zcash_primitives::{
    primitives::{PaymentAddress},
 };

-
 use crate::lightclient::{LightClientConfig};

 mod data;
@@ -58,7 +57,6 @@ fn now() -> f64 {
    SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs() as f64
 }

-
 /// Sha256(Sha256(value))
 pub fn double_sha256(payload: &[u8]) -> Vec<u8> {
    let h1 = Sha256::digest(&payload);