From aecf18af0ce7fd6766bad4823a81ab505748b944 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Wed, 30 Oct 2019 20:15:31 +0800 Subject: [PATCH] Fix merge error --- common/log/access.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/log/access.go b/common/log/access.go index 032f04cc..f3398b55 100644 --- a/common/log/access.go +++ b/common/log/access.go @@ -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 }