From 4bcf01a5f307a6747dc2ec21c0ff4946c73ad695 Mon Sep 17 00:00:00 2001
From: liwei <liwei1dao@gmail.com>
Date: Thu, 13 Oct 2022 12:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=82=E5=B8=B8=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lego/utils/codec/factory/factory_struct.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lego/utils/codec/factory/factory_struct.go b/lego/utils/codec/factory/factory_struct.go
index b3f07a925..03efeb622 100644
--- a/lego/utils/codec/factory/factory_struct.go
+++ b/lego/utils/codec/factory/factory_struct.go
@@ -12,12 +12,6 @@ import (
 	"unicode"
 	"unsafe"
 
-<<<<<<< HEAD
-=======
-	"go_dreamfactory/lego/sys/log"
-	"go_dreamfactory/lego/utils/codec/codecore"
-
->>>>>>> 830997df434fe5d5d1769768c53efaa0caff2969
 	"github.com/modern-go/reflect2"
 )