From 4118f488bfde33af64bc98578d4267409cf3631c Mon Sep 17 00:00:00 2001
From: "hinto.janai" <hinto.janai@protonmail.com>
Date: Thu, 5 Sep 2024 17:19:57 -0400
Subject: [PATCH] fix merge

---
 rpc/interface/README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rpc/interface/README.md b/rpc/interface/README.md
index 59d9f04c..e8be2d0d 100644
--- a/rpc/interface/README.md
+++ b/rpc/interface/README.md
@@ -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 {