Fixed a merge conflicts

lijunwangs · Sep 10, 2022 · 2d74ab1 · 2d74ab1
1 parent 95bbb6a
commit 2d74ab1
Showing 1 changed file with 0 additions and 15 deletions.
diff --git 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))
 }