Skip to content

Commit 22e2879

Browse files
committed
removed git merge conflict text from join.rs
1 parent f75f973 commit 22e2879

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

wasm/src/programs/manager/join.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,14 @@ use crate::{
3636
TransactionNative,
3737
},
3838
};
39-
<<<<<<< HEAD
40-
=======
4139
use snarkvm_algorithms::snark::varuna::VarunaVersion;
4240
use snarkvm_synthesizer_program::StackKeys;
4341

44-
>>>>>>> 6ec7b6ca4f36d72b719e6f921809e3bfcee3b7e8
4542
use js_sys::Array;
4643
use rand::{SeedableRng, rngs::StdRng};
4744
use snarkvm_console::prelude::{ConsensusVersion, Network};
4845
use snarkvm_ledger_query::{Query, QueryTrait};
4946
use snarkvm_synthesizer::prelude::{execution_cost_v1, execution_cost_v2};
50-
use snarkvm_synthesizer_program::StackKeys;
5147
use std::str::FromStr;
5248

5349
#[wasm_bindgen]

0 commit comments

Comments
 (0)