mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 23:38:08 +00:00
One conflict, in SpanGuard.h: this branch added struct TraceBytes and upstream added enum SpanRole at the same position after TraceCategory. Unrelated declarations, so both are kept.