Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix text systems broken when resolving merge conflicts in #8026 #8422

Merged
merged 1 commit into from
Apr 17, 2023

Conversation

nicoburns
Copy link
Contributor

Objective

Solution

Restore correct system schedule for text systems

@alice-i-cecile
Copy link
Member

Ping @ickshonpe @Weibye @TimJentzsch for a quick review :)

@alice-i-cecile alice-i-cecile added C-Bug An unexpected or incorrect behavior A-UI Graphical user interfaces, styles, layouts, and widgets labels Apr 17, 2023
@alice-i-cecile alice-i-cecile added this to the 0.11 milestone Apr 17, 2023
@nicoburns nicoburns changed the title Fix text systems broken during merge conflict fixing Fix text systems broken when resolving merge conflicts in #8026 Apr 17, 2023
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Apr 17, 2023
Merged via the queue into bevyengine:main with commit fe0ad10 Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-UI Graphical user interfaces, styles, layouts, and widgets C-Bug An unexpected or incorrect behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants