Skip to content

Re-enable TZ test missed due to merge conflict. #6393

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.

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

Merged
merged 1 commit into from
Sep 27, 2022

Conversation

voxik
Copy link
Contributor

@voxik voxik commented Sep 16, 2022

This was disabled by b7577b4, while properly fixed upstream by:

ruby/spec#939

@eregon PTAL, the current status seems to be just wrongly resolved merge conflict.

This was disabled by b7577b4, while properly fixed upstream by:

ruby/spec#939
@hsbt hsbt mentioned this pull request Sep 20, 2022
Copy link
Member

@eregon eregon left a comment

Choose a reason for hiding this comment

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

Thanks!

And since the lines are far enough from each other git did not detect a conflict.
=begin shouldn't be used in specs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants