[Conflicts] Merge main into next #2914
Open
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
Co-authored-by: Kerstin Reichinger <[email protected]>
Fix InputBase `border-color` in default state and on hover to match design. Co-authored-by: Kerstin Reichinger <[email protected]>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
6c148e2 to
a4dc4e0
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
a4dc4e0 to
1f9a426
Compare
Co-authored-by: Kerstin Reichinger <[email protected]> Co-authored-by: Johannes Obermair <[email protected]> Co-authored-by: Ricky James Smith <[email protected]>
vivid-planet-bot
changed the title
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
1f9a426 to
0be3719
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
0be3719 to
60dc7bf
Compare
Co-authored-by: Markus Fichtner <[email protected]> Co-authored-by: Johannes Obermair <[email protected]>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
60dc7bf to
6cb4231
Compare
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 is an automated pull request to merge changes from
mainintonext. It has merge conflicts. To resolve conflicts, check out the branchmerge-main-into-nextlocally, make any necessary changes to conflicting files, and commit and publish your changes.