-
18손재민 authored# Conflicts: # Assets/Scripts/TetrisMap/MapManager.cs
1ad0b0ec
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| Enemy | ||
| Enemy.meta | ||
| Player.prefab | ||
| Player.prefab.meta | ||
| nofriction.physicsMaterial2D | ||
| nofriction.physicsMaterial2D.meta |
# Conflicts: # Assets/Scripts/TetrisMap/MapManager.cs
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| Enemy | ||
| Enemy.meta | ||
| Player.prefab | ||
| Player.prefab.meta | ||
| nofriction.physicsMaterial2D | ||
| nofriction.physicsMaterial2D.meta |