chore: fix rebase error

cashubtc · Nov 15, 2024 · 6f94aa5 · 6f94aa5
1 parent ad47123
commit 6f94aa5
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/crates/cdk-integration-tests/tests/fake_wallet.rs b/crates/cdk-integration-tests/tests/fake_wallet.rs
@@ -3,24 +3,10 @@ use std::time::Duration;
 
 use anyhow::{bail, Result};
 use bip39::Mnemonic;
-<<<<<<< HEAD
 use cdk::amount::SplitTarget;
 use cdk::cdk_database::WalletMemoryDatabase;
 use cdk::nuts::{
     CurrencyUnit, MeltBolt11Request, MeltQuoteState, MintQuoteState, PreMintSecrets, State,
-=======
-use cdk::{
-    amount::SplitTarget,
-    cdk_database::WalletMemoryDatabase,
-    nuts::{
-        CurrencyUnit, MeltBolt11Request, MeltQuoteState, MintQuoteState, PreMintSecrets, SecretKey,
-        State,
-    },
-    wallet::{
-        client::{HttpClient, HttpClientMethods},
-        Wallet,
-    },
->>>>>>> a71e0874 (feat: nut19 signature on mint witness)
 };
 use cdk::wallet::client::{HttpClient, HttpClientMethods};
 use cdk::wallet::Wallet;