Jazh #9871
Closed
Jazh #9871
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
中文 -> 文字 Linked to font at /fonts Based on new i18n test suite format
Build ERROREDStarted: 2018-03-06 10:00:12 Failing Jobs
View more information about this build on: |
|
Can someone explain to me what went wrong to produce conflicts? Thanks. |
|
Probably e45d0cf landing combined with the whitespace changes on this branch making git unable to merge automatically. |
|
Now that #9718 (comment) has been reverted, how do i remove the conflict messages from this PR? (Assuming that that was the cause.) |
|
It wasn't reverted in the end. |
|
Yeah. I'm waiting for the dust to settle, then i'll sort this out. |
|
Closing this to resubmit a clean version later. |
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.
Test format updated to match latest i18n test suite files. Includes fixes for missing lang attributes.
中文 -> 文字
Linked to font at /fonts
CSS font meta tag removed.
Tabs, trailing spaces, and unnecessary newlines removed.
More metadata removed from ref files.
This PR includes and makes redundant #9805 (comment)
The font at /fonts is not included in this PR. See #9818 for that.