Merge branch 'fix-main-scene-merge'

Browse Source

...

This commit is contained in:

Toomas Tamm

2021-01-23 19:18:53 +02:00

parent ac44560328 15573f72f7

commit 6521486237

3 changed files with 341 additions and 341 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/Scenes/Main_scene.unity

Binary file not shown.