Resolve conflicts

This commit is contained in:
Sergei Maklagin
2025-07-13 21:44:23 +03:00
20 changed files with 134 additions and 64 deletions

6
go.mod
View File

@@ -31,13 +31,13 @@ require (
github.com/sagernet/quic-go v0.49.0-beta.1
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
github.com/sagernet/sing v0.6.10
github.com/sagernet/sing-dns v0.4.5
github.com/sagernet/sing-dns v0.4.6
github.com/sagernet/sing-mux v0.3.2
github.com/sagernet/sing-quic v0.4.3
github.com/sagernet/sing-quic v0.4.4
github.com/sagernet/sing-shadowsocks v0.2.8
github.com/sagernet/sing-shadowsocks2 v0.2.1
github.com/sagernet/sing-shadowtls v0.2.0
github.com/sagernet/sing-tun v0.6.8
github.com/sagernet/sing-tun v0.6.9
github.com/sagernet/sing-vmess v0.2.3
github.com/sagernet/smux v1.5.34-mod.2
github.com/sagernet/utls v1.6.7