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.

Sign up for GitHub

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

Jump to bottom

Fix merge artifact #13

Merged

TotalKrill merged 1 commit into TotalKrill:cosmic-text from rparrett:cosmic-text-merge-artifacts

Jun 20, 2024

rparrett commented Jun 20, 2024 •

edited

Loading

Objective

Fix a merge artifact that was undoing an intended Bevy change in dyamic_texture_atlas_builder.rs.
Adjust code in font_atlas.rs to work with that change. (changed a variable name for clarity)


          Fix merge artifact undoing bevyengine#13717

f3c1938

TotalKrill merged commit 1e29a56 into TotalKrill:cosmic-text

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet