fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
pull/551/head
‘hanzhixiao’ 2 years ago committed by Xinwei Xiong(cubxxw-openim)
parent 9b0d40c634
commit fe2b279ac2

@ -41,7 +41,6 @@ func Start(
rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
options ...grpc.ServerOption, options ...grpc.ServerOption,
) error { ) error {
rpcPort = 10030
fmt.Println( fmt.Println(
"start", "start",
rpcRegisterName, rpcRegisterName,

Loading…
Cancel
Save