From 7c5f60f210bfd05ea22d3a65f04e245989fdaade Mon Sep 17 00:00:00 2001
From: Rubens Brandao <git@rubens.io>
Date: Tue, 6 Apr 2021 15:18:55 -0300
Subject: Resolved merge upstream conflicts

---
 mumd/src/network/udp.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mumd/src/network/udp.rs')

diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs
index 11a3f27..3ca77af 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -9,12 +9,12 @@ use mumble_protocol::crypt::ClientCryptState;
 use mumble_protocol::ping::{PingPacket, PongPacket};
 use mumble_protocol::voice::VoicePacket;
 use mumble_protocol::Serverbound;
-use std::{collections::HashMap, sync::RwLock};
+use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::net::{Ipv6Addr, SocketAddr};
 use std::rc::Rc;
 use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 use tokio::{join, net::UdpSocket};
 use tokio::sync::{mpsc, watch, Mutex};
 use tokio::time::{interval, Duration};
-- 
cgit v1.2.1