# Conflicts: # Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab |
||
|---|---|---|
| .. | ||
| 48.jpg | ||
| 48.jpg.meta | ||
| SplashPanel.prefab | ||
| SplashPanel.prefab.meta | ||
| splash.jpg | ||
| splash.jpg.meta | ||
# Conflicts: # Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab |
||
|---|---|---|
| .. | ||
| 48.jpg | ||
| 48.jpg.meta | ||
| SplashPanel.prefab | ||
| SplashPanel.prefab.meta | ||
| splash.jpg | ||
| splash.jpg.meta | ||