merge main into dev

succinctlabs · Dec 19, 2024 · 780546e · 780546e
2 parents 0db7412 + f1628aa
commit 780546e
Show file tree

Hide file tree

Showing 40 changed files with 3,582 additions and 511 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,11 +40,9 @@ crates/prover/semaphore-gnark-11
 crates/prover/trusted-setup
 crates/prover/vk
 
-<<<<<<< Updated upstream
 # Example legacy elf
 examples/elf 
-=======
+
 # Example fibonacci groth16 / plonk proofs
 examples/fibonacci/fibonacci-groth16.bin
-examples/fibonacci/fibonacci-plonk.bin
->>>>>>> Stashed changes
+examples/fibonacci/fibonacci-plonk.bin