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

[v9.x staging] merge conflicts in util.js #19182

Closed
devsnek opened this issue Mar 6, 2018 · 2 comments
Closed

[v9.x staging] merge conflicts in util.js #19182

devsnek opened this issue Mar 6, 2018 · 2 comments

Comments

@devsnek
Copy link
Member

devsnek commented Mar 6, 2018 •
edited
Loading

@MylesBorins

https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L437 and https://github.com/nodejs/node/blob/v9.x-staging/lib/util.js#L617

culprit is d7f01bf
@estrada9166
Copy link
Contributor

estrada9166 commented Mar 6, 2018 •
edited
Loading

There are also other lines with the same issue in the same file

@vsemozhetbyt vsemozhetbyt mentioned this issue Mar 6, 2018
Closed
3 tasks
@devsnek
Copy link
Member Author

devsnek commented Mar 6, 2018

seems like this was quietly fixed by someone, i'll close

@devsnek devsnek closed this as completed Mar 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@devsnek @estrada9166