From 2d74ab1e0a5fb7d866849bab5de4ce203f3eb4f8 Mon Sep 17 00:00:00 2001
From: Lijun Wang <83639177+lijunwangs@users.noreply.github.com>
Date: Sat, 10 Sep 2022 14:40:45 -0700
Subject: [PATCH] Fixed a merge conflicts

---
 dos/src/main.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/dos/src/main.rs b/dos/src/main.rs
index 155980b98ff453..1587cfcbe63cd0 100644
--- a/dos/src/main.rs
+++ b/dos/src/main.rs
@@ -734,19 +734,4 @@ pub mod test {
             },
         );
     }
-<<<<<<< HEAD
-=======
-
-    #[test]
-    #[ignore]
-    fn test_dos_with_blockhash_and_payer() {
-        run_dos_with_blockhash_and_payer(/*tpu_use_quic*/ false)
-    }
-
-    #[test]
-    #[ignore]
-    fn test_dos_with_blockhash_and_payer_and_quic() {
-        run_dos_with_blockhash_and_payer(/*tpu_use_quic*/ true)
-    }
->>>>>>> 4bda909827 (Enable QUIC client by default. Add arg to disable QUIC client. Take 2 (#26927))
 }