# Conflicts: # UserSettings/EditorUserSettings.asset |
||
|---|---|---|
| .. | ||
| Models | ||
| Scene | ||
| Sky | ||
| Texture | ||
| Models.meta | ||
| Scene.meta | ||
| Sky.meta | ||
| Texture.meta | ||
# Conflicts: # UserSettings/EditorUserSettings.asset |
||
|---|---|---|
| .. | ||
| Models | ||
| Scene | ||
| Sky | ||
| Texture | ||
| Models.meta | ||
| Scene.meta | ||
| Sky.meta | ||
| Texture.meta | ||