From 980ce4593be9d55a9ced3786097db18bef67bbbb Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Thu, 17 Oct 2019 01:56:25 -0400 Subject: [PATCH] Fix merge artifacts in Cargo.toml --- zebra-network/Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index cfd83a652..fa9438415 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -12,9 +12,6 @@ bitflags = "1.2" byteorder = "1.3" bytes = "0.4" chrono = "0.4" -thiserror = "1" -serde = { version = "1", features = ["serde_derive"] } -pin-project = "0.4" hex = "0.4" # indexmap has rayon support for parallel iteration, # 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" rand = "0.7" serde = { version = "1", features = ["serde_derive"] } +thiserror = "1" tokio = "=0.2.0-alpha.6" futures-preview = "=0.3.0-alpha.19"