From e17c1b875485a054bb96c16b836051177dd75e5f Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@rudder.io>
Date: Sun, 5 May 2019 20:17:45 +0200
Subject: [PATCH] fix(all): Broken merge

---
 lettre_email/src/lib.rs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lettre_email/src/lib.rs b/lettre_email/src/lib.rs
index b713d21..4231505 100644
--- a/lettre_email/src/lib.rs
+++ b/lettre_email/src/lib.rs
@@ -13,18 +13,6 @@
     unused_import_braces
 )]
 
-<<<<<<< HEAD
-=======
-extern crate failure;
-#[macro_use]
-extern crate failure_derive;
-
-extern crate base64;
-extern crate email as email_format;
-extern crate lettre;
-extern crate time;
-extern crate uuid;
->>>>>>> v0.9.x
 pub extern crate mime;
 
 pub mod error;