Fixed Cargo.toml conflict resolution

informalsystems · Dec 2, 2019 · e715204 · e715204
1 parent e913d95
commit e715204
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tendermint/Cargo.toml b/tendermint/Cargo.toml
@@ -48,11 +48,7 @@ subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
 tai64 = { version = "3", features = ["chrono"] }
 toml = { version = "0.5" }
 uuid = { version = "0.7", default-features = false }
-<<<<<<< HEAD
 zeroize = { version = "1.0", features = ["zeroize_derive"] }
-=======
-zeroize = { version = "0.9" }
->>>>>>> Use subtle-encoding instead of hex crate
 
 [dev-dependencies]
 serde_json = "1"