From 0aef4c74c2dfc90b7d62482f5c5b12c4d3b0955f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 7 Sep 2023 11:14:25 +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

---
 modules/gm/module.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/gm/module.go b/modules/gm/module.go
index d26bf0666..8928304eb 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -770,7 +770,6 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 						Message: err.Error(),
 					}
 				}
->>>>>>> b15e4e2a3a601f09b5bd8577d94611771e4c807d
 				this.Debug("使用bingo命令:uid = %s ",
 					log.Field{Key: "uid", Value: session.GetUserId()},
 					log.Field{Key: "0", Value: datas[0]},