fix conflicts

67d3e569 · Shengliang Guan · e8c5ed86 · 38f6f3b0 · 67d3e569
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

source/server/vnode/src/vnodeMgmt.c source/server/vnode/src/vnodeMgmt.c +0 -1

未找到文件。
--- a/source/server/vnode/src/vnodeMgmt.c
+++ b/source/server/vnode/src/vnodeMgmt.c
@@ -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;