296ec11d7a
# Conflicts: # Assets/Scripts/Player/PlayerController.cs |
||
---|---|---|
.. | ||
Input | ||
Prefabs | ||
Scenes | ||
Scripts | ||
Input.meta | ||
Prefabs.meta | ||
Scenes.meta | ||
Scripts.meta |
296ec11d7a
# Conflicts: # Assets/Scripts/Player/PlayerController.cs |
||
---|---|---|
.. | ||
Input | ||
Prefabs | ||
Scenes | ||
Scripts | ||
Input.meta | ||
Prefabs.meta | ||
Scenes.meta | ||
Scripts.meta |