mirror of
https://github.com/XRPLF/rippled.git
synced 2026-08-18 21:10:02 +00:00
Conflict resolution: - features.macro: both sides added an amendment at the top of the list. Kept both, with fixCleanup3_4_0 above SmartEscrow. - NetworkOPs.cpp: develop moved the ledgerClosed stream publisher out of pubLedger and into the new publishLedgerStreams helper, while this branch had added the Smart Escrow fee fields to the old inline version. Took the helper and moved the gas_limit / bytecode_size_limit / gas_price block into it, keeping the featureSmartEscrow guard.