# Conflicts: # Assets/Scenes/Furniture Scene.unity # Assets/_Project/Art/Models/MetaPart/bedside_table_1_shelve.fbx.meta # Assets/_Project/Scripts/Editor.meta |
||
|---|---|---|
| .idea | ||
| .utmp | ||
| Assets | ||
| Packages | ||
| ProjectSettings | ||
| .gitattributes | ||
| .gitignore | ||
| README.md | ||
# Conflicts: # Assets/Scenes/Furniture Scene.unity # Assets/_Project/Art/Models/MetaPart/bedside_table_1_shelve.fbx.meta # Assets/_Project/Scripts/Editor.meta |
||
|---|---|---|
| .idea | ||
| .utmp | ||
| Assets | ||
| Packages | ||
| ProjectSettings | ||
| .gitattributes | ||
| .gitignore | ||
| README.md | ||