mirror of
https://github.com/XRPLF/rippled.git
synced 2026-10-01 17:28:13 +00:00
Conflict in src/xrpld/telemetry/AppMetricGauges.cpp: this branch had added JobQueue.h beside Journal.h inside the telemetry guard, while the incoming side moved Journal.h out of the guard so the constructor signature has a direct include in both builds. Kept both changes: JobQueue.h stays guarded, Journal.h appears once, unguarded.