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 21:32:52 +0800 |
| commit | e79feadf101f8cf05ce32ca5be0a9e44a75da1a9 (patch) | |
| tree | 4ee251e28b28b2827411d9bca718c0e960107241 /dex/nodetable.go | |
| parent | 6ed9128259023d440ea3297da85e0a0dba12e941 (diff) | |
| download | dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar.gz dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar.bz2 dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar.lz dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar.xz dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.tar.zst dexon-e79feadf101f8cf05ce32ca5be0a9e44a75da1a9.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 } |