Skip to content
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

Jump to bottom

Fix docs for CancellableContinuation #2112

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Fix docs for CancellableContinuation #2112

merged 1 commit into from
Jul 20, 2020

Conversation

1zaman
Copy link
Contributor

@1zaman 1zaman commented Jun 29, 2020

Basically reverts the documentation update in #800 due to the changes in #896

@elizarov
Copy link
Contributor

elizarov commented Jul 3, 2020

Thanks. Can you, please, rebase it onto the develop branch.

@elizarov elizarov self-requested a review July 3, 2020 10:48
elizarov
elizarov suggested changes Jul 3, 2020
View reviewed changes
Copy link
Contributor

@elizarov elizarov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should go over develop branch.

@1zaman 1zaman changed the base branch from master to develop July 4, 2020 07:32
@1zaman
Copy link
Contributor Author

1zaman commented Jul 19, 2020

@elizarov: I have rebased and targetted it to develop, so it should be good to merge.

@1zaman 1zaman requested a review from elizarov July 19, 2020 10:37
@1zaman
Fix docs for CancellableContinuation
0cb53b7 
Basically reverts the documentation update in commit
49b6305 due to the changes in commit
876e9ba
elizarov
elizarov approved these changes Jul 20, 2020
View reviewed changes
Copy link
Contributor

@elizarov elizarov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@elizarov elizarov merged commit 716d21c into Kotlin:develop Jul 20, 2020
@1zaman 1zaman deleted the cancellable_cont_doc_fix branch July 23, 2020 00:43
recheej pushed a commit to recheej/kotlinx.coroutines that referenced this pull request Dec 28, 2020
@1zaman @recheej
Fix docs for CancellableContinuation (Kotlin#2112)
bedf587 
Basically reverts the documentation update in commit
49b6305 due to the changes in commit
876e9ba
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elizarov elizarov elizarov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@1zaman @elizarov