From 1586ea3b2c2952aada2b740b0585af51fb226e72 Mon Sep 17 00:00:00 2001
From: Francisca Ortega <franciscaortega713@gmail.com>
Date: Mon, 9 Dec 2024 16:23:14 -0300
Subject: [PATCH] fix: changes for merge

---
 src/async_resolver.rs           | 1 -
 src/client/client_connection.rs | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/async_resolver.rs b/src/async_resolver.rs
index a4d029c1..d66c5fb4 100644
--- 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
index e3abef28..2bd7ea7e 100644
--- 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;