Fixed merge conflict

Browse Source

...

This commit is contained in:

Jan Racek

2026-03-28 11:18:01 +01:00

parent a1465de9a0 d80ac111c2

commit dcb1066d80

407 changed files with 183557 additions and 1971 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

0

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset Normal file → Executable file