From c333d855fca0743de1d58ef14e3c2f6389f73145 Mon Sep 17 00:00:00 2001
From: Quentin Smith <quentin@mit.edu>
Date: Tue, 18 Jul 2023 17:13:43 -0400
Subject: [PATCH] Remove merge error

---
 embassy-nrf/src/pdm.rs  |  2 +-
 examples/nrf/Cargo.toml | 37 -------------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 examples/nrf/Cargo.toml

diff --git a/embassy-nrf/src/pdm.rs b/embassy-nrf/src/pdm.rs
index 1fc717fd..f2675bb7 100644
--- a/embassy-nrf/src/pdm.rs
+++ b/embassy-nrf/src/pdm.rs
@@ -463,4 +463,4 @@ macro_rules! impl_pdm {
             type Interrupt = crate::interrupt::typelevel::$irq;
         }
     };
-}
\ No newline at end of file
+}
diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
deleted file mode 100644
index 8309dda0..00000000
--- a/examples/nrf/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-edition = "2021"
-name = "embassy-nrf-examples"
-version = "0.1.0"
-
-[features]
-default = ["nightly"]
-nightly = ["embassy-executor/nightly", "embassy-nrf/nightly", "embassy-nrf/unstable-traits", "embassy-usb", "embassy-usb-serial", "embassy-usb-hid", "embassy-usb-ncm", "embedded-io/async", "embassy-net"]
-
-[dependencies]
-embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
-embassy-sync = { version = "0.1.0", path = "../../embassy-sync", features = ["defmt"] }
-embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["defmt", "integrated-timers"] }
-embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] }
-embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] }
-embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "pool-16"], optional = true }
-embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"], optional = true }
-embassy-usb-serial = { version = "0.1.0", path = "../../embassy-usb-serial", features = ["defmt"], optional = true }
-embassy-usb-hid = { version = "0.1.0", path = "../../embassy-usb-hid", features = ["defmt"], optional = true }
-embassy-usb-ncm = { version = "0.1.0", path = "../../embassy-usb-ncm", features = ["defmt"], optional = true }
-embedded-io = "0.3.0"
-
-defmt = "0.3"
-defmt-rtt = "0.3"
-
-static_cell = "1.0"
-cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
-cortex-m-rt = "0.7.0"
-panic-probe = { version = "0.3", features = ["print-defmt"] }
-futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
-rand = { version = "0.8.4", default-features = false }
-fixed = "1.10.0"
-embedded-storage = "0.3.0"
-usbd-hid = "0.5.2"
-serde = { version = "1.0.136", default-features = false }
-num-integer = { version = "0.1.45", default-features = false }
-microfft = "0.5.0"