From a2baa1d8e0991b786504f5f10bdc2e853c201773 Mon Sep 17 00:00:00 2001
From: Yoshua Wuyts <yoshuawuyts@gmail.com>
Date: Sun, 13 Oct 2019 21:12:05 +0200
Subject: [PATCH] rename stream::join to stream::merge

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
---
 src/stream/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stream/mod.rs b/src/stream/mod.rs
index 3d1b103..d165e87 100644
--- a/src/stream/mod.rs
+++ b/src/stream/mod.rs
@@ -48,6 +48,6 @@ cfg_if! {
 
         #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
         #[doc(inline)]
-        pub use async_macros::{join_stream as join, JoinStream as Join};
+        pub use async_macros::{join_stream as merge, JoinStream as Merge};
     }
 }