Fix merge error.

Conflux-Chain · Mar 13, 2020 · c9b9c9a · c9b9c9a
1 parent 4433a79
commit c9b9c9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/src/rpc/impls/alliance.rs b/client/src/rpc/impls/alliance.rs
@@ -45,7 +45,7 @@ impl RpcImpl {
     pub fn new(
         _consensus: SharedConsensusGraph, sync: SharedSynchronizationService,
         block_gen: Arc<TGBlockGenerator>, tx_pool: SharedTransactionPool,
-        _config: RpcImplConfiguration, executor: Arc<Executor>,
+        _config: RpcImplConfiguration,
     ) -> Self
     {
         RpcImpl {