Merge branch 'master' into benchmarking

2023-06-13 15:55:04 -04:00 · 2023-06-13 15:55:04 -04:00 · 756bd4a220
parent afcaf4a600 f8e4b3e2da
commit 756bd4a220
1 changed files with 0 additions and 7 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -36,14 +36,7 @@ serde = "1.0.156"
 serde_json = "1.0.94"
 num-traits = "0.2.15"
 ark-relations = { version = "0.4.0", features = ["std", "tracing-subscriber"] }
-<<<<<<< HEAD
-<<<<<<< HEAD
 rs-poseidon = {git = "https://github.com/status-im/rs-poseidon" }

 [dev-dependencies]
 criterion = "0.3"
-=======
->>>>>>> ebef300 (Ark circom and rust ffi (#5))
-=======
-rs-poseidon = {git = "https://github.com/status-im/rs-poseidon" }
->>>>>>> f8e4b3e (extract poseidon to it's own package (#8))