diff options
author | Mission Liao <mission.liao@dexon.org> | 2018-12-25 10:06:35 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:55 +0800 |
commit | 6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9 (patch) | |
tree | a8020f5aace2a3f3ac3de3bcbe98bdc8226245a6 /core/types/block_test.go | |
parent | b39d0be8e1fd2e870fafd2c23e7d5cb220696a60 (diff) | |
download | dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.gz dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.bz2 dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.lz dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.xz dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.zst dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.zip |
vendor: sync DEXON core and fix conflicts/missings (#101)
Merging these commits in DEXON consensus core:
- https://github.com/dexon-foundation/dexon-consensus/commit/dce509a13ef5873b9cae3c1cabdb97e219b6fb7d
- https://github.com/dexon-foundation/dexon-consensus/commit/6d1c1aeea0d3e75d10cbb2712c68b4c422ba8ba6
- https://github.com/dexon-foundation/dexon-consensus/commit/c1ed57c4abaf1f4758e52f082bb7114ad00c8b39
Diffstat (limited to 'core/types/block_test.go')
0 files changed, 0 insertions, 0 deletions