Fix merge conflicts

shawnxie999 · Aug 26, 2024 · 9578002 · 9578002
1 parent e1251d4
commit 9578002
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/include/xrpl/protocol/TxFormats.h b/include/xrpl/protocol/TxFormats.h
@@ -195,21 +195,21 @@ enum TxType : std::uint16_t
 
     /** This transaction type deletes an Oracle instance */
     ttORACLE_DELETE = 52,
-/** This transaction creates a new MPTokenIssuance object. */
-    ttMPTOKEN_ISSUANCE_CREATE = 53,
+
+    /** This transaction type fixes a problem in the ledger state */
+    ttLEDGER_STATE_FIX = 53,
+
+    /** This transaction creates a new MPTokenIssuance object. */
+    ttMPTOKEN_ISSUANCE_CREATE = 54,
 
     /** This transaction destroys an existing MPTokenIssuance object. */
-    ttMPTOKEN_ISSUANCE_DESTROY = 54,
+    ttMPTOKEN_ISSUANCE_DESTROY = 55,
 
     /** This transaction destroys an existing MPTokenIssuance object. */
-    ttMPTOKEN_AUTHORIZE = 55,
+    ttMPTOKEN_AUTHORIZE = 56,
 
     /** This transaction sets an existing MPTokenIssuance or MPToken object. */
-    ttMPTOKEN_ISSUANCE_SET = 56,
-
-    /** This transaction type fixes a problem in the ledger state */
-    ttLEDGER_STATE_FIX = 53,
-
+    ttMPTOKEN_ISSUANCE_SET = 57,
 
     /** This system-generated transaction type is used to update the status of the various amendments.