aboutsummaryrefslogtreecommitdiff
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
parent8aca324c2d8955daed113297abd50312429ca87a (diff)
embassy-boot: resolve conflicts
-rw-r--r--embassy-boot/boot/Cargo.toml1
-rw-r--r--embassy-boot/nrf/Cargo.toml1
2 files changed, 0 insertions, 2 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
diff --git a/embassy-boot/nrf/Cargo.toml b/embassy-boot/nrf/Cargo.toml
index 05ab87896..e46736889 100644
--- a/embassy-boot/nrf/Cargo.toml
+++ b/embassy-boot/nrf/Cargo.toml
@@ -28,7 +28,6 @@ cfg-if = "1.0.0"
28nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true } 28nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true }
29 29
30[features] 30[features]
31default = ["nightly"]
32defmt = [ 31defmt = [
33 "dep:defmt", 32 "dep:defmt",
34 "embassy-boot/defmt", 33 "embassy-boot/defmt",