Merge remote-tracking branch 'origin/BS'
# Conflicts: # Assets/Data.meta # Assets/Models/Animation.meta # Assets/Prefabs/UIs.meta # Assets/Scripts/Interactors/Mannequin.cs # Assets/Scripts/PlayerController.cs
Showing
Assets/Prefabs/UIs.meta
0 → 100644
This diff is collapsed.
Assets/Scripts/Managers.meta
0 → 100644
Please register or sign in to comment