From 63fde8119ada9a0d77f626885be989ca6122b7f2 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sat, 12 May 2018 18:41:46 +0200
Subject: [PATCH] [fix] passBlockDocument fields in public
---
documents/blockchain/v10/documents/block.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/documents/blockchain/v10/documents/block.rs b/documents/blockchain/v10/documents/block.rs
index 0305af99..a3786156 100644
--- a/documents/blockchain/v10/documents/block.rs
+++ b/documents/blockchain/v10/documents/block.rs
@@ -114,7 +114,11 @@ pub struct BlockDocument {
/// Currency parameters (only in genesis block)
pub parameters: Option<BlockParameters>,
/// Hash of the previous block
+<<<<<<< HEAD
pub previous_hash: Hash,
+=======
+ pub previous_hash: Option<Hash>,
+>>>>>>> ab39d74... [fix] passBlockDocument fields in public
/// Issuer of the previous block
pub previous_issuer: Option<ed25519::PublicKey>,
/// Hash of the deterministic content of the block
--
GitLab