2.x: Fix javadoc for Single.flatMapObservable (#4669)

vanniktech · akarnokd · commit 39a4e42e0aa1 · 2016-10-05T12:47:32.000+02:00
diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java
@@ -1922,8 +1922,7 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e
     }
 
     /**
-     * Returns a Single that is based on applying a specified function to the item emitted by the source Single,
->>>>>>> refs/remotes/akarnokd/SoloFlatMapIterable
+     * Returns an Observable that is based on applying a specified function to the item emitted by the source Single,
      * where that function returns a SingleSource.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.png" alt="">

Original file line number	Diff line number	Diff line change
`@@ -1922,8 +1922,7 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`	`1924`	`/**`
`1925`		`- * Returns a Single that is based on applying a specified function to the item emitted by the source Single,`
`1926`		`->>>>>>> refs/remotes/akarnokd/SoloFlatMapIterable`
	`1925`	`+ * Returns an Observable that is based on applying a specified function to the item emitted by the source Single,`
`1927`	`1926`	`* where that function returns a SingleSource.`
`1928`	`1927`	`* <p>`
`1929`	`1928`	`* <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.png" alt="">`