diff --git a/documents/blockchain/v10/documents/block.rs b/documents/blockchain/v10/documents/block.rs index 0305af99761abe685cafcc3d3c8d1f2c839398b5..a3786156a37899c6155cd98036d92676130973d5 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