From 95f808ccd8a663bce86d522210a8b598495c48ca Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Wed, 30 Oct 2019 20:24:38 +0800 Subject: [PATCH] Fix merge error --- app/dispatcher/default.go | 1 - 1 file changed, 1 deletion(-) diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 83f22cbf..ef2ec44c 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -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"