diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-06 16:02:56 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 21fabd3f164b23a3f984fceb1d8cdd7ab6c62978 (patch) | |
| tree | 6bd6d60a4d4ef3a6e906c12f7309d9fd45b1998c /dex/nodetable.go | |
| parent | 97f5cf98e41a6ae9400e7dde6ae2d064e90ce793 (diff) | |
| download | dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.gz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.bz2 dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.lz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.xz dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.tar.zst dexon-21fabd3f164b23a3f984fceb1d8cdd7ab6c62978.zip | |
dex: fix conflict caused by rebase
Diffstat (limited to 'dex/nodetable.go')
| -rw-r--r-- | dex/nodetable.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dex/nodetable.go b/dex/nodetable.go index f1291b4fd..9fe1d6b71 100644 --- a/dex/nodetable.go +++ b/dex/nodetable.go @@ -15,8 +15,8 @@ import ( type NodeMeta struct { ID enode.ID IP net.IP - UDP int - TCP int + UDP uint + TCP uint Timestamp uint64 Sig []byte } |