Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

Browse Source

# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset

...

This commit is contained in:

aswew1538

2026-06-24 17:45:01 +09:00

parent 122d59b0f5 f6799f08a9

commit d42f14c566

1 changed files with 2 additions and 2 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

BIN

Assets/My project/Fonts/Pretendard-Black SDF.asset LFS

Binary file not shown.