diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-08-24 14:36:59 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-08-24 14:36:59 +0000 |
| commit | 62a232f5c64890e2d666d23227df1c21675fc863 (patch) | |
| tree | 78dc3e80181da30d331e0ac3634dfa99c4784498 /examples/two-tasks.rs | |
| parent | 53dbbad891e1c223ba5b1939e114b37667011f11 (diff) | |
| parent | 90c9f64c5a010944bc1bc4efb308f18e0af9100a (diff) | |
Merge #85
85: fix master r=japaric a=japaric
closes #80
Co-authored-by: Ferdia McKeogh <chocol4te@users.noreply.github.com>
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'examples/two-tasks.rs')
| -rw-r--r-- | examples/two-tasks.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/two-tasks.rs b/examples/two-tasks.rs index 4f567f0..2348915 100644 --- a/examples/two-tasks.rs +++ b/examples/two-tasks.rs @@ -1,7 +1,6 @@ //! Two tasks running at the *same* priority with access to the same resource #![deny(unsafe_code)] #![deny(warnings)] -#![feature(proc_macro)] #![no_std] extern crate cortex_m_rtfm as rtfm; |