diff options
author | Wei-Ning Huang <w@dexon.org> | 2018-11-06 16:02:56 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:49:56 +0800 |
commit | 1ab5b6da04e8ab304f81d81da3604640fad003a8 (patch) | |
tree | 3adb4345dfa0e76a692fcf1b84eb351a368bfe50 /dex/nodetable.go | |
parent | 3bb027dec94d7c12a0088f586ddf15e42122b768 (diff) | |
download | dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar.gz dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar.bz2 dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar.lz dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar.xz dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.tar.zst dexon-1ab5b6da04e8ab304f81d81da3604640fad003a8.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 } |