Skip to content

Commit 9062cd8

Browse files
committed
Rebase to master, move code to the internal.mixed
1 parent f73bc87 commit 9062cd8

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* the License for the specific language governing permissions and limitations under the License.
1212
*/
1313

14-
package io.reactivex.internal.operators.flowable;
14+
package io.reactivex.internal.operators.mixed;
1515

1616
import java.util.concurrent.atomic.AtomicReference;
1717

src/test/java/io/reactivex/InternalWrongNaming.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,7 @@ public void flowableNoObserver() throws Exception {
185185
"FlowableConcatWithCompletable",
186186
"FlowableMergeWithSingle",
187187
"FlowableMergeWithMaybe",
188-
"FlowableMergeWithCompletable",
189-
"FlowableSwitchMapCompletable",
190-
"FlowableSwitchMapSingle",
191-
"FlowableSwitchMapMaybe"
188+
"FlowableMergeWithCompletable"
192189
);
193190
}
194191
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* the License for the specific language governing permissions and limitations under the License.
1212
*/
1313

14-
package io.reactivex.internal.operators.flowable;
14+
package io.reactivex.internal.operators.mixed;
1515

1616
import static org.junit.Assert.*;
1717

0 commit comments

Comments
 (0)