处理异常冲突代码

2022-10-13 12:08:28 +08:00 · 2022-10-13 12:08:28 +08:00 · 4bcf01a5f3
commit 4bcf01a5f3
parent cf91bd07e2
1 changed files with 0 additions and 6 deletions
--- 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"
 )