Drop leftover conflict markers

2023-04-14 08:26:05 +02:00 · 2023-04-14 08:26:05 +02:00 · 13279536aa
parent 37ae7549fb
commit 13279536aa
1 changed files with 0 additions and 4 deletions
--- a/programs/mango-v4/tests/cases/test_perp_settle_fees.rs
+++ b/programs/mango-v4/tests/cases/test_perp_settle_fees.rs
@ -339,10 +339,6 @@ async fn test_perp_settle_fees() -> Result<(), TransportError> {
    )
    .await
    .unwrap();
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
    // No change
    {
        let perp_market = solana.get_account::<PerpMarket>(perp_market).await;