Resolve conflicts

This commit is contained in:
Sergei Maklagin
2025-06-08 19:54:17 +03:00
50 changed files with 4702 additions and 6 deletions

View File

@@ -6,4 +6,5 @@ const (
V2RayTransportTypeQUIC = "quic"
V2RayTransportTypeGRPC = "grpc"
V2RayTransportTypeHTTPUpgrade = "httpupgrade"
V2RayTransportTypeXHTTP = "xhttp"
)