[css-fonts] [palettes] Remove the <string> values from override-color and base-palette - #6651
Merged
Merged
Conversation
Contributor
|
I'm unsure on resolving this conflict, because there are several PR that have altered this section. |
svgeesus
requested changes
Sep 28, 2021
svgeesus
left a comment
Contributor
There was a problem hiding this comment.
I'm worries about messing this up with a manual resolution of the merge conflict. Could you re-base, please?
… and base-palette Fixes w3c#6627.
litherum
force-pushed
the
palettes-string
branch
from
October 5, 2021 06:27
3030be1 to
a95c382
Compare
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.
Fixes #6627.