github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix merge error

pull/2531/head
Shelikhoo 2019-10-30 20:15:31 +08:00 committed by Nicholas Wang
parent 70e70d314e
commit be76b37554
No known key found for this signature in database
GPG Key ID: F20CA399C9BD9100
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/log/access.go
View File

@ -3,7 +3,6 @@ package log
import ( import (
"context" "context"
"strings" "strings"
"context"
"v2ray.com/core/common/serial" "v2ray.com/core/common/serial"
) )
@ -57,5 +56,5 @@ func AccessMessageFromContext(ctx context.Context) *AccessMessage {
if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok { if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok {
return accessMessage return accessMessage
} }
return nil return nil
} }