fix: changes for merge

niclabs · Dec 9, 2024 · 1586ea3 · 1586ea3
1 parent cfc2e03
commit 1586ea3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/src/async_resolver.rs b/src/async_resolver.rs
@@ -24,7 +24,6 @@ use std::time::SystemTime;
 use std::sync::{Arc, Mutex};
 use std::vec;
 use std::collections::HashMap;
-use std::collections::HashMap;
 
 /// Asynchronous resolver for DNS queries.
 ///

diff --git a/src/client/client_connection.rs b/src/client/client_connection.rs
@@ -2,15 +2,6 @@ use crate::message::DnsMessage;
 use std::net::IpAddr;
 use tokio::time::Duration;
 use super::client_error::ClientError;
-
-<<<<<<< HEAD
-=======
-use tokio::net::TcpStream;
-use tokio_rustls::rustls::{ClientConfig, ServerName};
-use tokio_rustls::TlsConnector;
-use std::sync::Arc;
-use webpki::DNSNameRef;
->>>>>>> 260d4ce (add: tokio_tls dependencies)
 use async_trait::async_trait;