SyntheticBird/cuprate-hinto-janai
1
0
Fork 0
mirror of https://github.com/hinto-janai/cuprate.git synced 2025-01-19 01:04:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge

Browse source
This commit is contained in:
hinto.janai 2024-09-05 17:19:57 -04:00
parent 3965349f71
commit 4118f488bf
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rpc/interface/README.md
View file

@ -85,13 +85,7 @@ use cuprate_rpc_types::{
json::{JsonRpcRequest, JsonRpcResponse, GetBlockCountResponse}, json::{JsonRpcRequest, JsonRpcResponse, GetBlockCountResponse},
other::{OtherRequest, OtherResponse}, 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}; use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy};
>>>>>>> main
// Send a `/get_height` request. This endpoint has no inputs. // Send a `/get_height` request. This endpoint has no inputs.
async fn get_height(port: u16) -> OtherResponse { async fn get_height(port: u16) -> OtherResponse {