mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-07-05 16:38:17 -04:00
Fix merge error
This commit is contained in:
parent
35e9da8ca6
commit
aecf18af0c
@ -3,7 +3,6 @@ package log
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"context"
|
||||
|
||||
"v2ray.com/core/common/serial"
|
||||
)
|
||||
@ -61,5 +60,5 @@ func AccessMessageFromContext(ctx context.Context) *AccessMessage {
|
||||
if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok {
|
||||
return accessMessage
|
||||
}
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user