diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-macros/src/macros/mod.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-macros/src/macros/mod.rs')
| -rw-r--r-- | embassy-macros/src/macros/mod.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/embassy-macros/src/macros/mod.rs b/embassy-macros/src/macros/mod.rs index a5e7a50e6..572094ca6 100644 --- a/embassy-macros/src/macros/mod.rs +++ b/embassy-macros/src/macros/mod.rs | |||
| @@ -1,4 +1,2 @@ | |||
| 1 | pub mod cortex_m_interrupt; | ||
| 2 | pub mod cortex_m_interrupt_declare; | ||
| 3 | pub mod main; | 1 | pub mod main; |
| 4 | pub mod task; | 2 | pub mod task; |