# Conflicts: # Assets/ManagedResources/Prefabs/Live2d/live2d_c_0035_s1.prefab.meta |
||
|---|---|---|
| .. | ||
| BuildResources | ||
| Editor | ||
| GameIcon | ||
| Scenes | ||
| Scripts | ||
| BuildResources.meta | ||
| Editor.meta | ||
| GameIcon.meta | ||
| Scenes.meta | ||
| Scripts.meta | ||
# Conflicts: # Assets/ManagedResources/Prefabs/Live2d/live2d_c_0035_s1.prefab.meta |
||
|---|---|---|
| .. | ||
| BuildResources | ||
| Editor | ||
| GameIcon | ||
| Scenes | ||
| Scripts | ||
| BuildResources.meta | ||
| Editor.meta | ||
| GameIcon.meta | ||
| Scenes.meta | ||
| Scripts.meta | ||