Merge branch 'update_chain33_6.0.2' of https://github.com/vipwzw/plugin into update_chain33_6.0.2

2e9d43ad · vipwzw · e180c5ae · a9b8b092 · 2e9d43ad · 2e9d43ad
Commit 2e9d43ad authored Nov 26, 2018 by vipwzw
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

round_state.go plugin/consensus/tendermint/types/round_state.go +0 -0

certutils.go ...rt/authority/tools/cryptogen/generator/utils/certutils.go +0 -0

No files found.
--- a/plugin/consensus/tendermint/types/round_state.go
+++ b/plugin/consensus/tendermint/types/round_state.go
--- a/plugin/dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go
+++ b/plugin/dapp/cert/authority/tools/cryptogen/generator/utils/certutils.go