From 2788cc321e9519e40a8f24178752317a9936c6df Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Wed, 14 Sep 2022 19:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sys/db/core.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/db/core.go b/sys/db/core.go
index 65d3be764..c15e8028a 100644
--- 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
 }