aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf
diff options
context:
space:
mode:
authorQuentin Smith <[email protected]>2023-07-18 17:13:43 -0400
committerQuentin Smith <[email protected]>2023-07-18 17:14:25 -0400
commitc333d855fca0743de1d58ef14e3c2f6389f73145 (patch)
treedc74631e15584cb9666fdb3ccfb357dee895a015 /embassy-nrf
parent42de1c3a06561f11960cee85079fb74080b0bb70 (diff)
Remove merge error
Diffstat (limited to 'embassy-nrf')
-rw-r--r--embassy-nrf/src/pdm.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-nrf/src/pdm.rs b/embassy-nrf/src/pdm.rs
index 1fc717fd1..f2675bb7a 100644
--- a/embassy-nrf/src/pdm.rs
+++ b/embassy-nrf/src/pdm.rs
@@ -463,4 +463,4 @@ macro_rules! impl_pdm {
463 type Interrupt = crate::interrupt::typelevel::$irq; 463 type Interrupt = crate::interrupt::typelevel::$irq;
464 } 464 }
465 }; 465 };
466} \ No newline at end of file 466}