Resolve conflicts

This commit is contained in:
Sergei Maklagin
2026-02-26 22:58:45 +03:00
13 changed files with 1470 additions and 19 deletions

6
go.mod
View File

@@ -19,6 +19,7 @@ require (
github.com/golang-migrate/migrate/v4 v4.19.1
github.com/huandu/go-sqlbuilder v1.38.1
github.com/insomniacslk/dhcp v0.0.0-20250417080101-5f8cf70e8c5f
github.com/klauspost/cpuid/v2 v2.3.0
github.com/lib/pq v1.10.9
github.com/libdns/alidns v1.0.5-libdns.v1.beta1
github.com/libdns/cloudflare v0.2.2-0.20250708034226-c574dccb31a6
@@ -63,6 +64,7 @@ require (
google.golang.org/grpc v1.78.0
google.golang.org/protobuf v1.36.11
howett.net/plist v1.0.1
lukechampine.com/blake3 v1.4.1
)
require (
@@ -138,7 +140,6 @@ require (
github.com/jsimonetti/rtnetlink v1.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.3 // indirect
github.com/klauspost/cpuid/v2 v2.3.0
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/libdns/libdns v1.1.0 // indirect
@@ -187,7 +188,6 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.4.1 // indirect
xorm.io/builder v0.3.7 // indirect
xorm.io/xorm v1.0.2 // indirect
)
@@ -201,3 +201,5 @@ replace github.com/sagernet/sing-mux => github.com/shtorm-7/sing-mux v0.3.4-exte
replace github.com/sagernet/sing-dns => github.com/shtorm-7/sing-dns v0.4.6-extended-1.0.0
replace github.com/ameshkov/dnscrypt/v2 => github.com/shtorm-7/dnscrypt/v2 v2.4.0-extended-1.0.0
replace github.com/sagernet/sing-vmess => github.com/starifly/sing-vmess v0.2.7-mod.9