diff options
author | Wei-Ning Huang <w@dexon.org> | 2018-11-06 16:02:56 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
commit | e7f82d2246372fd693b616b8049d79629a167411 (patch) | |
tree | cf498ded93f2288ab85115522cd06b5e508e7f40 /dex/nodetable.go | |
parent | 2fb2425b6c72924efdf3e441b24290a63664cc99 (diff) | |
download | dexon-e7f82d2246372fd693b616b8049d79629a167411.tar dexon-e7f82d2246372fd693b616b8049d79629a167411.tar.gz dexon-e7f82d2246372fd693b616b8049d79629a167411.tar.bz2 dexon-e7f82d2246372fd693b616b8049d79629a167411.tar.lz dexon-e7f82d2246372fd693b616b8049d79629a167411.tar.xz dexon-e7f82d2246372fd693b616b8049d79629a167411.tar.zst dexon-e7f82d2246372fd693b616b8049d79629a167411.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 } |