Skip to content

Commit ee10685

Browse files
weikengchennpwardberkeley
authored andcommitted
try to fix nostd
1 parent 6a7bc6a commit ee10685

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ 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
36-
ark-nonnative-field = { git = "https://github.com/arkworks-rs/nonnative" }
37-
38-
=======
39-
>>>>>>> remove the dependency of nonnative for now
4035
bench-utils = { git = "https://github.com/arkworks-rs/utils" }
4136
rand_core = { version = "0.5", default-features = false }
4237
digest = "0.8"

0 commit comments

Comments
 (0)