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

Resolve various conflicts for Vancouver 2018 #118

Merged
merged 2 commits into from
Oct 10, 2018
Merged

Resolve various conflicts for Vancouver 2018 #118

merged 2 commits into from
Oct 10, 2018

Conversation

mcollina
Copy link
Member

@mcollina mcollina commented Oct 9, 2018

Resolves various conflict for Vancouver 2018. I've shorten up things at the end, and moved the break a bit.

@nodejs/promises-debugging
@nodejs/streams
@nodejs/diagnostics
@BridgeAR

Fixes #117

cc @ladyleet

joyeecheung
joyeecheung approved these changes Oct 9, 2018
View reviewed changes
Copy link
Collaborator

@joyeecheung joyeecheung left a comment

Choose a reason for hiding this comment

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

LGTM

misterdjules
misterdjules approved these changes Oct 9, 2018
View reviewed changes
Copy link

@misterdjules misterdjules left a comment

Choose a reason for hiding this comment

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

Thank you for doing this 🙏

mhdawson
mhdawson approved these changes Oct 9, 2018
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@mcollina mcollina merged commit 0463d38 into openjs-foundation:master Oct 10, 2018
@mcollina mcollina deleted the resolve-conflicts branch October 10, 2018 01:29
@joyeecheung joyeecheung mentioned this pull request Oct 13, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guybedford guybedford guybedford left review comments

@misterdjules misterdjules misterdjules approved these changes

@joyeecheung joyeecheung joyeecheung approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

@mhdawson mhdawson mhdawson approved these changes

@keywordnew keywordnew Awaiting requested review from keywordnew

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

Successfully merging this pull request may close these issues.
6 participants
@mcollina @guybedford @misterdjules @joyeecheung @BridgeAR @mhdawson