max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embassy-boot: resolve conflicts

Browse Source
This commit is contained in:
sander 2023-04-20 10:40:40 +02:00
parent 8aca324c2d
commit 0e01b28d5e
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embassy-boot/boot/Cargo.toml
View File

@ -45,7 +45,6 @@ default_features = false
features = ["rand", "std", "u32_backend"] features = ["rand", "std", "u32_backend"]
[features] [features]
default = ["nightly"]
ed25519-dalek = ["dep:ed25519-dalek", "_verify"] ed25519-dalek = ["dep:ed25519-dalek", "_verify"]
ed25519-salty = ["dep:salty", "_verify"] ed25519-salty = ["dep:salty", "_verify"]

1
embassy-boot/nrf/Cargo.toml
View File

@ -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 } nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true }
[features] [features]
default = ["nightly"]
defmt = [ defmt = [
"dep:defmt", "dep:defmt",
"embassy-boot/defmt", "embassy-boot/defmt",