mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 07:26:51 +00:00
caa704de10
Two conflicts, both resolved by composing the sides rather than taking one. cfg/xrpld-example.cfg: this branch had moved the batch-processor keys under their own heading while upstream edited them in place, so a merge-both would have documented them twice. Upstream's range sentences are applied to the relocated block and the head-sampling note keeps its position. 02-design-decisions.md: the summary table changed on both sides for different reasons. Upstream renamed ledger_index to current_ledger_seq and ledger_seq; this branch had corrected the PathFinding row to the keys it actually emits. Both are kept.