# Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs |
||
|---|---|---|
| .. | ||
| Item.cs | ||
| Item.cs.meta | ||
# Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs |
||
|---|---|---|
| .. | ||
| Item.cs | ||
| Item.cs.meta | ||