Fix merge issues

This commit is contained in:
QuantumEntangledAndy authored and Andrew King committed 2023-02-27 09:14:07 +07:00
1 parent 9945b02fd9
commit 0f76622b17
1 file changed
+2 -3
@@ -64,10 +64,9 @@ impl<'a> Stream for BcPayloadStream<'a> {
Poll::Pending
}
}
Poll::Pending => {
return Poll::Pending;
}
}
Poll::Ready(None) => Poll::Ready(None),
Poll::Pending => Poll::Pending,
}
}
}