# Conflicts: # Assets/Scenes/Furniture Scene.unity # Assets/_Project/Art/Models/MetaPart/bedside_table_1_shelve.fbx.meta # Assets/_Project/Scripts/Editor.meta |
||
|---|---|---|
| .. | ||
| Editor | ||
| MetaPart | ||
| RunnerPart | ||
| Editor.meta | ||
| MetaPart.meta | ||
| RunnerPart.meta | ||
# Conflicts: # Assets/Scenes/Furniture Scene.unity # Assets/_Project/Art/Models/MetaPart/bedside_table_1_shelve.fbx.meta # Assets/_Project/Scripts/Editor.meta |
||
|---|---|---|
| .. | ||
| Editor | ||
| MetaPart | ||
| RunnerPart | ||
| Editor.meta | ||
| MetaPart.meta | ||
| RunnerPart.meta | ||