mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-26 23:19:07 +00:00
ff1a905ede
Three conflicts, all resolved by keeping this branch's rewrite and re-applying the incoming change onto it: - 09-data-collection-reference.md: phase-7 rewrote both attribute tables, so the incoming table would have reverted them. Kept phase-7's and re-applied the two "XRPL epoch" spellings. - integration-test.sh: phase-7 moved these checks from StatsD to OTel and no longer defines check_statsd_metric, so only this side compiles. - TelemetryConfig.cpp: the incoming side carried networkTypeFromId(), which this branch already has. Kept one definition and took the incoming doc wording, which the auto-merged body below it already matches.