fixup! Merge branch 'develop' into 0.14

This commit is contained in:
Aaron Weiss 2019-06-06 13:41:30 -04:00
parent c383c6241e
commit 0b7a7a0f02
No known key found for this signature in database
GPG key ID: 047D32DF25DC22EF

View file

@ -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 {