liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wh_zcy 2022-09-14 19:33:35 +08:00
parent 6c8c6fba73
commit 2788cc321e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/db/core.go
View File

@ -33,11 +33,8 @@ func OnInit(config map[string]interface{}, option ...Option) (err error) {
return return
} }
defsys, err = newSys(options) defsys, err = newSys(options)
<<<<<<< HEAD
// defsys.Local().Redis.GetClient().FlushAll(context.TODO()) // defsys.Local().Redis.GetClient().FlushAll(context.TODO())
=======
>>>>>>> 5774dd3b (更新随机任务战斗任务)
return return
} }