Skip to content

Correct documentation for Observable.merge #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsxwing merged 1 commit into from
May 8, 2015
Merged

Correct documentation for Observable.merge #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/rx/lang/scala/Observable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,7 @@ trait Observable[+T]
* @param that
* an Observable to be merged
* @return an Observable that emits items from `this` and `that` until
* `this` or `that` emits `onError` or `onComplete`.
* `this` or `that` emits `onError` or both Observables emit `onCompleted`.
*/
def merge[U >: T](that: Observable[U]): Observable[U] = {
val thisJava: rx.Observable[_ <: U] = this.asJavaObservable
Expand Down