Open
Conversation
goanpeca
force-pushed
the
enh/vertical-align
branch
from
792dd17 to
9d2f0f6
Compare
freakboy3742
approved these changes
Apr 27, 2020
Member
freakboy3742
left a comment
freakboy3742
left a comment
There was a problem hiding this comment.
Another straightforward change.
| VISIBILITY_CHOICES, VISIBLE, WHITE_SPACE_CHOICES, WIDOWS_CHOICES, | ||
| WORD_SPACING_CHOICES, Z_INDEX_CHOICES, OtherProperty, | ||
| VERTICAL_ALIGN_CHOICES, VISIBILITY_CHOICES, VISIBLE, WHITE_SPACE_CHOICES, | ||
| WIDOWS_CHOICES, WORD_SPACING_CHOICES, Z_INDEX_CHOICES, OtherProperty, |
Member
There was a problem hiding this comment.
Given the frequency with which this block is causing merge conflicts, we may want to move to either an import * (with a well defined __all__ and a NOQA to silence the warning)
Contributor
Author
|
It's ok, I can make the rebase ;-), those merge conflicts should appear much longer when the declaration code is finished, and we are close to finishing it :-p. Actually the problem is I sort the imports, if I just add them at the end there would not be any issues. |
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.
No description provided.