From 0b7a7a0f028fbe37746d7c349ac290a47f04c82d Mon Sep 17 00:00:00 2001
From: Aaron Weiss <awe@pdgn.co>
Date: Thu, 6 Jun 2019 13:41:30 -0400
Subject: [PATCH] fixup! Merge branch 'develop' into 0.14

---
 src/client/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/mod.rs b/src/client/mod.rs
index 38843e2..1588898 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -828,7 +828,6 @@ impl Future for IrcClientFuture {
 /// crate. An easy to use abstraction that does not require this knowledge is available via
 /// [`IrcReactors`](./reactor/struct.IrcReactor.html).
 pub struct PackedIrcClient(pub IrcClient, pub Box<Future<Item = (), Error = error::IrcError> + Send + 'static>);
->>>>>>> develop
 
 #[cfg(test)]
 mod test {