Skip to content

Commit

Permalink
Merge a5e19f6 into fdfe057
Browse files Browse the repository at this point in the history
  • Loading branch information
MainRo committed Mar 1, 2021
2 parents fdfe057 + a5e19f6 commit 186f928
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rx/__init__.py
Expand Up @@ -328,7 +328,7 @@ def fork_join(*sources: Observable) -> Observable:
---a-----b--c---d-|
--1---2------3-4---|
-a--------- b---|
-a---------b---|
[ fork_join() ]
--------------------d4b|
Expand Down
2 changes: 1 addition & 1 deletion rx/operators/__init__.py
Expand Up @@ -1188,7 +1188,7 @@ def fork_join(*others: Observable) -> Callable[[Observable], Observable]:
---a-----b--c---d-|
--1---2------3-4---|
-a--------- b---|
-a---------b---|
[ fork_join() ]
--------------------d4b|
Expand Down

0 comments on commit 186f928

Please sign in to comment.