Fix merge error

5 years ago · be76b37554
parent 70e70d314e
commit be76b37554
1 changed files with 1 additions and 2 deletions
--- 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"
 )
@ -57,5 +56,5 @@ func AccessMessageFromContext(ctx context.Context) *AccessMessage {
 	if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok {
 		return accessMessage
 	}
-	return nil 
+	return nil
 }