conflict partially resolved

Browse Source

...

This commit is contained in:

trubkokrtek

2026-05-17 11:31:00 +02:00

parent ab6263cb10

commit 023bddc91b

9 changed files with 1276 additions and 236 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

74

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

File diff suppressed because one or more lines are too long