mirror of
https://github.com/XRPLF/rippled.git
synced 2026-10-12 06:38:01 +00:00
Conflict resolved in PeerImp.cpp, proposal receive handler: keep this branch's proposalSpan name, and take the arriving change that allocates the holder only for a live span.