Fix merge error

pull/2531/head
Shelikhoo 2019-10-30 20:24:38 +08:00 committed by Nicholas Wang
parent be76b37554
commit 7db6bd4b78
No known key found for this signature in database
GPG Key ID: F20CA399C9BD9100
1 changed files with 0 additions and 1 deletions

View File

@ -15,7 +15,6 @@ import (
"v2ray.com/core/common/buf"
"v2ray.com/core/common/log"
"v2ray.com/core/common/net"
"v2ray.com/core/common/log"
"v2ray.com/core/common/protocol"
"v2ray.com/core/common/session"
"v2ray.com/core/features/outbound"