mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
One conflicted file, docs/telemetry-runbook.md, with three spots: - Build section: both sides added different text at one point. Kept both, incoming sentence first, then this branch's "Run against a live network". - Disabling section, first spot: this branch's wording names the config section and says no rebuild is needed, so it already covers the incoming sentence. - Disabling section, second spot: kept this branch's paragraph and folded in the one point it lacked, that both flags have to be passed.