# Conflicts: # Assets/CRC/game.asset # Assets/ManagedResources/BG/changjing_07.JPG.meta # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset |
||
|---|---|---|
| .. | ||
| Atlas | ||
| Atlas.meta | ||
| UpdatePanel.prefab | ||
| UpdatePanel.prefab.meta | ||
# Conflicts: # Assets/CRC/game.asset # Assets/ManagedResources/BG/changjing_07.JPG.meta # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset |
||
|---|---|---|
| .. | ||
| Atlas | ||
| Atlas.meta | ||
| UpdatePanel.prefab | ||
| UpdatePanel.prefab.meta | ||