Remove duplicated lines in contrib/tzcode/stdtime/private.h #154
Conversation
This file contains 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
ngie-eign
approved these changes
Dec 16, 2018
There was a problem hiding this comment.
This change is good to merge. I don't see it in the upstream version of tzcode: https://github.com/valodzka/tzcode/blob/master/private.h#L204 .
@emaste: is there anything that needs to be done to merge this change?
freebsd-git
pushed a commit
that referenced
this pull request
May 31, 2021
Note by imp: this is clearly a mis-merge from the vendor branch which doesn't have this stutter in it. Reviewed by: imp@,ngie@ Pull Request: #154
|
d912068 in main pulls this in, closing out this pull request. |
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Dec 9, 2021
Note by imp: this is clearly a mis-merge from the vendor branch which doesn't have this stutter in it. Reviewed by: imp@,ngie@ Pull Request: freebsd/freebsd-src#154
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pull request eliminates some duplication in the source.