Merge: resolve Roboto-Bold SDF conflict

Browse Source

...

This commit is contained in:

Leo Qu

2026-03-03 20:23:32 -05:00

parent faf9b62c30

commit 2ee0888932

5 changed files with 6121 additions and 9851 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

15130

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset

File diff suppressed because one or more lines are too long