octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge artifacts in Cargo.toml

This commit is contained in:
Deirdre Connolly 2019-10-17 01:56:25 -04:00 committed by Henry de Valence
parent 0db69addec
commit 980ce4593b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra-network/Cargo.toml
View File

@ -12,9 +12,6 @@ bitflags = "1.2"
byteorder = "1.3" byteorder = "1.3"
bytes = "0.4" bytes = "0.4"
chrono = "0.4" chrono = "0.4"
thiserror = "1"
serde = { version = "1", features = ["serde_derive"] }
pin-project = "0.4"
hex = "0.4" hex = "0.4"
# indexmap has rayon support for parallel iteration, # indexmap has rayon support for parallel iteration,
# which we don't use, so disable it to drop the dependencies. # which we don't use, so disable it to drop the dependencies.
@ -22,6 +19,7 @@ indexmap = { version = "1.2", default-features = false }
pin-project = "0.4" pin-project = "0.4"
rand = "0.7" rand = "0.7"
serde = { version = "1", features = ["serde_derive"] } serde = { version = "1", features = ["serde_derive"] }
thiserror = "1"
tokio = "=0.2.0-alpha.6" tokio = "=0.2.0-alpha.6"
futures-preview = "=0.3.0-alpha.19" futures-preview = "=0.3.0-alpha.19"