Fix conflict issues

commonprefix · Oct 27, 2023 · 88c2b9d · 88c2b9d
1 parent ffca16b
commit 88c2b9d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/contract.rs b/src/contract.rs
@@ -60,8 +60,7 @@ pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, Contract
 }
 
 mod execute {
-    use crate::lightclient::types::{BlockVerificationData, Forks, Update};
-    use crate::lightclient::types::{Forks, ReceiptLogs, Update};
+    use crate::lightclient::types::{BlockVerificationData, Forks, ReceiptLogs, Update};
     use cosmwasm_std::WasmMsg;
 
     use super::*;

diff --git a/src/lightclient/types.rs b/src/lightclient/types.rs
@@ -2,7 +2,6 @@ use std::{cmp::Ordering, vec};
 
 use crate::lightclient::helpers::{from_hex_string, to_hex_string};
 use alloy_rlp::{Buf, Decodable};
-use primitive_types::H256;
 use primitives::{ByteList, ByteVector, U64};
 use serde;
 use ssz_rs::prelude::*;