Fix merge error · be76b37554 - v2ray-core - https://git.xinac.net

Fix merge error

pull/2531/head

Shelikhoo 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

										
											1

common/log/access.go

										Unescape
										Escape
									
											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"

					)

					)