Fix bad merge

nymtech · Jul 12, 2024 · 12090a2 · 12090a2
1 parent da8d537
commit 12090a2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs b/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs
@@ -4,11 +4,8 @@
 use std::time::Duration;
 
 use crate::error::{Error, Result};
-<<<<<<< HEAD
 use crate::mixnet_connect::SharedMixnetClient;
-=======
 use crate::platform;
->>>>>>> origin/main
 use crate::routing::{catch_all_ipv4, catch_all_ipv6, replace_default_prefixes};
 use crate::tunnel::setup_route_manager;
 use crate::uniffi_custom_impls::TunStatus;