embassy-boot: resolve conflicts

2023-04-20 10:40:40 +02:00 · 2023-04-20 10:40:40 +02:00 · 0e01b28d5e
commit 0e01b28d5e
parent 8aca324c2d
2 changed files with 0 additions and 2 deletions
--- a/embassy-boot/boot/Cargo.toml
+++ b/embassy-boot/boot/Cargo.toml
@ -45,7 +45,6 @@ default_features = false
 features = ["rand", "std", "u32_backend"]

 [features]
-default = ["nightly"]
 ed25519-dalek = ["dep:ed25519-dalek", "_verify"]
 ed25519-salty = ["dep:salty", "_verify"]

--- a/embassy-boot/nrf/Cargo.toml
+++ b/embassy-boot/nrf/Cargo.toml
@ -28,7 +28,6 @@ cfg-if = "1.0.0"
 nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true }

 [features]
-default = ["nightly"]
 defmt = [
    "dep:defmt",
    "embassy-boot/defmt",