aboutsummaryrefslogtreecommitdiff
path: root/embassy-boot/boot
diff options
context:
space:
mode:
authorsander <[email protected]>2023-04-20 10:40:40 +0200
committersander <[email protected]>2023-04-20 10:40:40 +0200
commit0e01b28d5ecd56fc2d8b14fa0b90f3ec2b564b0f (patch)
tree66fa8762924d0a5291dc80604370371293085eaa /embassy-boot/boot
parent8aca324c2d8955daed113297abd50312429ca87a (diff)
embassy-boot: resolve conflicts
Diffstat (limited to 'embassy-boot/boot')
-rw-r--r--embassy-boot/boot/Cargo.toml1
1 files changed, 0 insertions, 1 deletions
diff --git a/embassy-boot/boot/Cargo.toml b/embassy-boot/boot/Cargo.toml
index 956b0f987..f641d5e1c 100644
--- a/embassy-boot/boot/Cargo.toml
+++ b/embassy-boot/boot/Cargo.toml
@@ -45,7 +45,6 @@ default_features = false
45features = ["rand", "std", "u32_backend"] 45features = ["rand", "std", "u32_backend"]
46 46
47[features] 47[features]
48default = ["nightly"]
49ed25519-dalek = ["dep:ed25519-dalek", "_verify"] 48ed25519-dalek = ["dep:ed25519-dalek", "_verify"]
50ed25519-salty = ["dep:salty", "_verify"] 49ed25519-salty = ["dep:salty", "_verify"]
51 50