Fix merge missing conflict

This commit is contained in:
Julien Cretin
2020-10-23 17:26:25 +02:00
parent 3755be1625
commit cb3369213f

View File

@@ -345,8 +345,6 @@
#![cfg_attr(not(feature = "std"), no_std)]
extern crate alloc;
#[macro_use]
extern crate alloc;