From cb3369213f9326eec58f0f39fd96d9e073047e7e Mon Sep 17 00:00:00 2001
From: Julien Cretin <cretin@google.com>
Date: Fri, 23 Oct 2020 17:26:25 +0200
Subject: [PATCH] Fix merge missing conflict

---
 libraries/persistent_store/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/persistent_store/src/lib.rs b/libraries/persistent_store/src/lib.rs
index a051716..f2753db 100644
--- a/libraries/persistent_store/src/lib.rs
+++ b/libraries/persistent_store/src/lib.rs
@@ -345,8 +345,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate alloc;
-
 #[macro_use]
 extern crate alloc;