mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-01 03:21:04 +00:00
Conflict in src/libxrpl/telemetry/SpanGuard.cpp: both sides added a different include in the same alphabetical slot — phase-4 added <initializer_list>, the incoming std::format change added <format>. Both are required, so both are kept in sorted order.