From 7d2282dbd284c80a5ae32f1a4d1c24234755f147 Mon Sep 17 00:00:00 2001
From: Johannes Weissmann <jo@starsheriff.eu>
Date: Mon, 11 Nov 2019 22:11:06 +0100
Subject: [PATCH] fix merge conflict

---
 src/stream/stream/mod.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/stream/stream/mod.rs b/src/stream/stream/mod.rs
index 653261f..2f21c38 100644
--- a/src/stream/stream/mod.rs
+++ b/src/stream/stream/mod.rs
@@ -68,11 +68,8 @@ mod zip;
 use all::AllFuture;
 use any::AnyFuture;
 use cmp::CmpFuture;
-<<<<<<< HEAD
 use count::CountFuture;
-=======
 use cycle::Cycle;
->>>>>>> master
 use enumerate::Enumerate;
 use eq::EqFuture;
 use filter_map::FilterMap;