From 7e2b22fbe54419c4c6bf54f6f0e984614e8d1f8d Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Fri, 20 May 2022 18:59:33 -0400
Subject: [PATCH] fix merge

---
 client/rpc/src/state/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/rpc/src/state/mod.rs b/client/rpc/src/state/mod.rs
index f85147d5cf683..232be4edc8aab 100644
--- a/client/rpc/src/state/mod.rs
+++ b/client/rpc/src/state/mod.rs
@@ -202,7 +202,6 @@ pub struct State<Block, Client> {
 	deny_unsafe: DenyUnsafe,
 }
 
-#[async_trait]
 impl<Block, Client> StateApiServer<Block::Hash> for State<Block, Client>
 where
 	Block: BlockT + 'static,