解决冲突

2022-09-14 19:33:35 +08:00 · 2022-09-14 19:33:35 +08:00 · 2788cc321e
commit 2788cc321e
parent 6c8c6fba73
1 changed files with 0 additions and 3 deletions
--- a/sys/db/core.go
+++ b/sys/db/core.go
@ -33,11 +33,8 @@ func OnInit(config map[string]interface{}, option ...Option) (err error) {
 		return
 	}
 	defsys, err = newSys(options)
-<<<<<<< HEAD

 	// defsys.Local().Redis.GetClient().FlushAll(context.TODO())
-=======
->>>>>>> 5774dd3b (更新随机任务战斗任务)
 	return
 }