fix conflicts

This commit is contained in:
Shengliang Guan 2021-10-28 11:05:04 +08:00
commit 67d3e56946
1 changed files with 0 additions and 1 deletions

View File

@ -28,7 +28,6 @@ static struct {
static int32_t vnodeParseCreateVnodeReq(SRpcMsg *rpcMsg, int32_t *vgId, SVnodeCfg *pCfg) {
SCreateVnodeMsg *pCreate = rpcMsg->pCont;
*vgId = htonl(pCreate->vgId);
pCfg->dropped = 0;