Fix merge missing conflict
This commit is contained in:
@@ -345,8 +345,6 @@
|
||||
|
||||
#![cfg_attr(not(feature = "std"), no_std)]
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
#[macro_use]
|
||||
extern crate alloc;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user