diff options
| author | sander <[email protected]> | 2023-04-20 10:40:40 +0200 |
|---|---|---|
| committer | sander <[email protected]> | 2023-04-20 10:40:40 +0200 |
| commit | 0e01b28d5ecd56fc2d8b14fa0b90f3ec2b564b0f (patch) | |
| tree | 66fa8762924d0a5291dc80604370371293085eaa /embassy-boot/nrf | |
| parent | 8aca324c2d8955daed113297abd50312429ca87a (diff) | |
embassy-boot: resolve conflicts
Diffstat (limited to 'embassy-boot/nrf')
| -rw-r--r-- | embassy-boot/nrf/Cargo.toml | 1 |
1 files changed, 0 insertions, 1 deletions
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" | |||
| 28 | nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true } | 28 | nrf-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] |
| 31 | default = ["nightly"] | ||
| 32 | defmt = [ | 31 | defmt = [ |
| 33 | "dep:defmt", | 32 | "dep:defmt", |
| 34 | "embassy-boot/defmt", | 33 | "embassy-boot/defmt", |