mirror of
https://github.com/hinto-janai/cuprate.git
synced 2025-01-19 01:04:32 +00:00
fix merge
This commit is contained in:
parent
3965349f71
commit
4118f488bf
1 changed files with 0 additions and 6 deletions
|
@ -85,13 +85,7 @@ use cuprate_rpc_types::{
|
|||
json::{JsonRpcRequest, JsonRpcResponse, GetBlockCountResponse},
|
||||
other::{OtherRequest, OtherResponse},
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy, Request};
|
||||
||||||| 0941f68
|
||||
use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy, RpcRequest};
|
||||
=======
|
||||
use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy};
|
||||
>>>>>>> main
|
||||
|
||||
// Send a `/get_height` request. This endpoint has no inputs.
|
||||
async fn get_height(port: u16) -> OtherResponse {
|
||||
|
|
Loading…
Reference in a new issue