# Conflicts: # project/assets/tilemap/tilemaps/tilemap_objects.png # project/scripts/tilemap/TileMapTileTypes.gd |
||
|---|---|---|
| .. | ||
| assets/tilemap | ||
| main-scenes | ||
| scripts | ||
| icon.svg | ||
| icon.svg.import | ||
| project.godot | ||
# Conflicts: # project/assets/tilemap/tilemaps/tilemap_objects.png # project/scripts/tilemap/TileMapTileTypes.gd |
||
|---|---|---|
| .. | ||
| assets/tilemap | ||
| main-scenes | ||
| scripts | ||
| icon.svg | ||
| icon.svg.import | ||
| project.godot | ||