removes backport merge conflicts

solana-labs · Jan 3, 2022 · a0d29fd · a0d29fd
1 parent d892eda
commit a0d29fd
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/streamer/src/recvmmsg.rs b/streamer/src/recvmmsg.rs
@@ -99,15 +99,9 @@ pub fn recv_mmsg(sock: &UdpSocket, packets: &mut [Packet]) -> io::Result<(usize,
         return Err(io::Error::last_os_error());
     }
     let mut npkts = 0;
-<<<<<<< HEAD
-    addrs
-        .iter()
-        .zip(&hdrs)
-=======
     let mut total_size = 0;
 
     izip!(addrs, hdrs, packets.iter_mut())
->>>>>>> 20b61e28b (Flip iter operations to keep associated address/header/packets together (#22245))
         .take(nrecv as usize)
         .filter_map(|(addr, hdr, pkt)| {
             let addr = cast_socket_addr(&addr, &hdr)?.to_std();