From 13279536aa46b1d6d3f488c009f03207fcf063e0 Mon Sep 17 00:00:00 2001
From: Christian Kamm <mail@ckamm.de>
Date: Fri, 14 Apr 2023 08:26:05 +0200
Subject: [PATCH] Drop leftover conflict markers

---
 programs/mango-v4/tests/cases/test_perp_settle_fees.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/programs/mango-v4/tests/cases/test_perp_settle_fees.rs b/programs/mango-v4/tests/cases/test_perp_settle_fees.rs
index ad5093807..66d9de4cc 100644
--- 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;