mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-11 06:23:47 +00:00
Merge conflicts
This commit is contained in:
parent
ecc0fb1e56
commit
e4eceefbb0
1 changed files with 1 additions and 1 deletions
|
|
@ -815,7 +815,7 @@ func (d *Downloader) findAncestor(p *peerConnection, remoteHeader *types.Header)
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight, floor)
|
ancestor, err = d.findAncestorBinarySearch(p, mode, localHeight+1, floor)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue