Fix merge conflict in the bench code

QED-it · May 13, 2024 · 8676e26 · 8676e26
1 parent 019cbc4
commit 8676e26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/benches/circuit.rs b/benches/circuit.rs
@@ -43,11 +43,7 @@ fn criterion_benchmark(c: &mut Criterion) {
                 )
                 .unwrap();
         }
-<<<<<<< HEAD
-        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap();
-=======
-        let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
->>>>>>> zsa1
+        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap().unwrap().0;
 
         let instances: Vec<_> = bundle
             .actions()

diff --git a/benches/note_decryption.rs b/benches/note_decryption.rs
@@ -73,11 +73,7 @@ fn bench_note_decryption(c: &mut Criterion) {
                 None,
             )
             .unwrap();
-<<<<<<< HEAD
-        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap();
-=======
-        let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
->>>>>>> zsa1
+        let bundle: Bundle<_, i64, OrchardZSA> = builder.build(rng).unwrap().unwrap().0;
         bundle
             .create_proof(&pk, rng)
             .unwrap()