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]},