Updates the merlin dependency to ^2 and the correct repo

This fixes the "batch" feature, see #126.
This commit is contained in:
François Garillot 2020-04-16 20:48:49 -07:00
parent 36a51acbf0
commit aa38c6419d
No known key found for this signature in database
GPG key ID: AC66C67853005854

View file

@ -24,7 +24,7 @@ features = ["nightly", "batch"]
[dependencies]
clear_on_drop = { version = "0.2" }
curve25519-dalek = { version = "2", default-features = false }
merlin = { version = "1", default-features = false, optional = true, git = "https://github.com/isislovecruft/merlin", branch = "develop" }
merlin = { version = "2", default-features = false, optional = true }
rand = { version = "0.7", default-features = false, optional = true }
rand_core = { version = "0.5", default-features = false, optional = true }
serde = { version = "1.0", optional = true }