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
 }