fix conflict

[bytom/bytom.git] / protocol / bc / types / block_header.go

diff --git a/protocol/bc/types/block_header.go b/protocol/bc/types/block_header.go
index 1a52eab..7b1c25e 100644 (file)
--- a/protocol/bc/types/block_header.go
+++ b/protocol/bc/types/block_header.go
@@ -19,7 +19,6 @@ type BlockHeader struct {
        PreviousBlockHash bc.Hash // The hash of the previous block.
        Timestamp         uint64  // The time of the block in seconds.
        BlockWitness
-       SupLinks
        BlockCommitment
 }