fix merge errors

niclabs · Dec 9, 2024 · 4e62a00 · 4e62a00
1 parent e4f17a2
commit 4e62a00
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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]