fix: merge.

movementlabsxyz · Feb 5, 2025 · de20e49 · de20e49
1 parent a9331fa
commit de20e49
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/protocol-units/bridge/service/src/chains/movement/client_framework.rs b/protocol-units/bridge/service/src/chains/movement/client_framework.rs
@@ -112,11 +112,7 @@ impl BridgeClientContract<MovementAddress> for MovementClientFramework {
 
 		Ok(())
 	}
-<<<<<<< HEAD
 
-=======
-
->>>>>>> 73adb88e1e50a283b08d175e189dfd51e9678dbe
 	async fn get_bridge_transfer_details(
 		&mut self,
 		bridge_transfer_id: BridgeTransferId,

diff --git a/protocol-units/bridge/service/tests/relayer.rs b/protocol-units/bridge/service/tests/relayer.rs
@@ -147,21 +147,13 @@ impl BridgeRelayerContract<MockAddress> for RelayerMockClient {
 	}
 	async fn get_bridge_transfer_details_with_nonce(
 		&mut self,
-<<<<<<< HEAD
 		_nonce: Nonce,
-=======
-		nonce: Nonce,
->>>>>>> 73adb88e1e50a283b08d175e189dfd51e9678dbe
 	) -> BridgeContractResult<Option<BridgeTransferInitiatedDetails<MockAddress>>> {
 		todo!()
 	}
 	async fn is_bridge_transfer_completed(
 		&mut self,
-<<<<<<< HEAD
 		_bridge_transfer_id: BridgeTransferId,
-=======
-		bridge_transfer_id: BridgeTransferId,
->>>>>>> 73adb88e1e50a283b08d175e189dfd51e9678dbe
 	) -> BridgeContractResult<bool> {
 		todo!()
 	}