mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-28 15:58:07 +00:00
# Conflicts: # include/xrpl/protocol/Indexes.h # include/xrpl/protocol/LedgerFormats.h # include/xrpl/protocol/TER.h # include/xrpl/protocol/TxFlags.h # include/xrpl/protocol/detail/ledger_entries.macro # include/xrpl/protocol/jss.h # include/xrpl/protocol_autogen/ledger_entries/MPToken.h # include/xrpl/tx/invariants/InvariantCheck.h # src/libxrpl/protocol/Indexes.cpp # src/libxrpl/protocol/InnerObjectFormats.cpp # src/libxrpl/protocol/TER.cpp # src/tests/libxrpl/protocol_autogen/ledger_entries/MPTokenTests.cpp