Re-enable TZ test missed due to merge conflict.#6393
Merged
eregon merged 1 commit intoruby:masterfrom Sep 27, 2022
Merged
Conversation
This was disabled by b7577b4, while properly fixed upstream by: ruby/spec#939
Merged
eregon
approved these changes
Sep 27, 2022
Member
eregon
left a comment
There was a problem hiding this comment.
Thanks!
And since the lines are far enough from each other git did not detect a conflict.
=begin shouldn't be used in specs.
This was referenced Sep 29, 2022
nagachika
pushed a commit
that referenced
this pull request
Oct 1, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.