From 0e01b28d5ecd56fc2d8b14fa0b90f3ec2b564b0f Mon Sep 17 00:00:00 2001
From: sander <sander.wittwer@dengineering.no>
Date: Thu, 20 Apr 2023 10:40:40 +0200
Subject: [PATCH] embassy-boot: resolve conflicts

---
 embassy-boot/boot/Cargo.toml | 1 -
 embassy-boot/nrf/Cargo.toml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/embassy-boot/boot/Cargo.toml b/embassy-boot/boot/Cargo.toml
index 956b0f98..f641d5e1 100644
--- 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"]
 
diff --git a/embassy-boot/nrf/Cargo.toml b/embassy-boot/nrf/Cargo.toml
index 05ab8789..e4673688 100644
--- 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",