From 2d1ed5288cab621aba39c3a81aae7042ead14fd5 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Thu, 25 Oct 2018 11:17:52 +0800 Subject: vendor: sync consensus core and fix conflict --- dex/app.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dex/app.go') diff --git a/dex/app.go b/dex/app.go index d5b7d3556..b1558b46f 100644 --- a/dex/app.go +++ b/dex/app.go @@ -261,9 +261,8 @@ func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Wi } return coreTypes.Witness{ - Timestamp: time.Unix(witnessBlock.Time().Int64(), 0), - Height: witnessBlock.NumberU64(), - Data: witnessData, + Height: witnessBlock.NumberU64(), + Data: witnessData, }, nil } -- cgit