Skip to content

Commit 6a7bc6a

Browse files
weikengchennpwardberkeley
authored andcommitted
remove the dependency of nonnative for now
1 parent 8c25981 commit 6a7bc6a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ ark-relations = { git = "https://github.com/arkworks-rs/snark", default-features
3232

3333
ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std" }
3434

35+
<<<<<<< HEAD
3536
ark-nonnative-field = { git = "https://github.com/arkworks-rs/nonnative" }
3637

38+
=======
39+
>>>>>>> remove the dependency of nonnative for now
3740
bench-utils = { git = "https://github.com/arkworks-rs/utils" }
3841
rand_core = { version = "0.5", default-features = false }
3942
digest = "0.8"

0 commit comments

Comments
 (0)