Fix merge errors

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

CHANGELOG.md

@@ -4,36 +4,6 @@ Update this for each program release and mainnet deployment.
 
 ## not on mainnet
 
-<<<<<<< HEAD
-### v0.22.0, 2024-2-
-
-- Perp: Allow reusing your own perp order slots immediately (#817)
-
-  Previously users who placed a lot of perp orders and used time-in-force needed
-  to wait for out-event cranking if their perp order before reusing an order
-  slot. Now perp order slots can be reused even when the out-event is still on
-  the event queue.
-
-- Introduce fallback oracles (#790, #813)
-
-  Fallback oracles can be used when the primary oracle is stale or not confident.
-  These oracles need to configured by the DAO to be usable by clients.
-
-  Fallback oracles may be based on Orca in addition to the other supported types.
-
-- Add serum3_cancel_by_client_order_id instruction (#798)
-
-  Can now cancel by client order id and not just the order id.
-
-- Delegates can now withdraw small token amounts to the owner's ata (#820)
-- Custom allocator to allow larger heap use if needed (#801)
-- Optimize compute use in token_deposit instruction (#786)
-- Disable support for v1 and v2 mango accounts (#783)
-- Cleanups, logging and tests (#819, #799, #818, #823, #834, #828, #833)
-
-## mainnet
-
-=======
 ### v0.23.0, 2024-3-
 
 - Allow disabling asset liquidations for tokens (#867)
@@ -87,7 +57,6 @@ Deployment: Mar 3, 2024 at 23:52:08 Central European Standard Time, https://expl
 - Disable support for v1 and v2 mango accounts (#783)
 - Cleanups, logging and tests (#819, #799, #818, #823, #834, #828, #833)
 
->>>>>>> main
 ### v0.21.3, 2024-2-9
 
 Deployment: Feb 9, 2024 at 11:21:58 Central European Standard Time, https://explorer.solana.com/tx/44f2wcLyLiic1aycdaPTdfwXJBMeGeuA984kvCByg4L5iGprH6xW3D35gd3bvZ6kU3SipEtoY3kDuexJghbxL89T

Cargo.lock

@@ -3367,11 +3367,7 @@ dependencies = [
 
 [[package]]
 name = "mango-v4"
-<<<<<<< HEAD
-version = "0.22.0"
-=======
 version = "0.23.0"
->>>>>>> main
 dependencies = [
  "anchor-lang",
  "anchor-spl",

mango_v4.json

@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-  "version": "0.22.0",
-=======
   "version": "0.23.0",
->>>>>>> main
   "name": "mango_v4",
   "instructions": [
     {
@@ -641,8 +637,6 @@
         {
           "name": "platformLiquidationFee",
           "type": "f32"
-<<<<<<< HEAD
-=======
         },
         {
           "name": "disableAssetLiquidation",
@@ -651,7 +645,6 @@
         {
           "name": "collateralFeePerDay",
           "type": "f32"
->>>>>>> main
         }
       ]
     },
@@ -1062,8 +1055,6 @@
           "type": {
             "option": "f32"
           }
-<<<<<<< HEAD
-=======
         },
         {
           "name": "disableAssetLiquidationOpt",
@@ -1082,7 +1073,6 @@
           "type": {
             "option": "bool"
           }
->>>>>>> main
         }
       ]
     },
@@ -7644,8 +7634,6 @@
             }
           },
           {
-<<<<<<< HEAD
-=======
             "name": "collectedCollateralFees",
             "docs": [
               "Collateral fees that have been collected (in native tokens)",
@@ -7664,16 +7652,11 @@
             "type": "f32"
           },
           {
->>>>>>> main
             "name": "reserved",
             "type": {
               "array": [
                 "u8",
-<<<<<<< HEAD
-                1920
-=======
                 1900
->>>>>>> main
               ]
             }
           }

programs/mango-v4/src/instructions/token_edit.rs

@@ -485,8 +485,6 @@ pub fn token_edit(
                 platform_liquidation_fee
             );
             bank.platform_liquidation_fee = I80F48::from_num(platform_liquidation_fee);
-<<<<<<< HEAD
-=======
             if platform_liquidation_fee != 0.0 {
                 require_group_admin = true;
             }
@@ -521,7 +519,6 @@ pub fn token_edit(
                 force_withdraw
             );
             bank.force_withdraw = u8::from(force_withdraw);
->>>>>>> main
             require_group_admin = true;
         }
     }