From 4e62a00a57246e258b5490423e2c512d1c1646e5 Mon Sep 17 00:00:00 2001 From: Francisca Ortega Date: Mon, 9 Dec 2024 16:29:24 -0300 Subject: [PATCH] fix merge errors --- src/client/tls_connection.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/tls_connection.rs b/src/client/tls_connection.rs index a189d6f7..1d188e1c 100644 --- a/src/client/tls_connection.rs +++ b/src/client/tls_connection.rs @@ -17,7 +17,6 @@ use std::convert::TryFrom; use std::io::Error as IoError; use std::io::ErrorKind; use std::io::Write; -use std::io::Write; use std::iter::FromIterator; use tokio::io::AsyncWriteExt; use tokio::io::AsyncReadExt; @@ -38,7 +37,6 @@ pub struct ClientTLSConnection { /// Read time timeout timeout: tokio::time::Duration, new_default: fn(IpAddr, Duration) -> Self, - new_default: fn(IpAddr, Duration) -> Self, } #[async_trait]