..

ple1n · Feb 11, 2025 · 2a1bd48 · 2a1bd48
1 parent eb544b2
commit 2a1bd48
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,11 +15,7 @@ workspace = { members = [
 
 [package]
 name = "nsproxy"
-<<<<<<< HEAD
 version = "1.0.0"
-=======
-version = "0.3.0"
->>>>>>> refs/remotes/gh/tun2socks5
 edition = "2021"
 build = "build.rs"