# Conflicts: # UserSettings/EditorUserSettings.asset |
||
|---|---|---|
| .. | ||
| Materials | ||
| Prefabs | ||
| Sprites | ||
| UI | ||
| DOTweenSettings.asset | ||
| DOTweenSettings.asset.meta | ||
| Materials.meta | ||
| Prefabs.meta | ||
| Sprites.meta | ||
| UI.meta | ||
# Conflicts: # UserSettings/EditorUserSettings.asset |
||
|---|---|---|
| .. | ||
| Materials | ||
| Prefabs | ||
| Sprites | ||
| UI | ||
| DOTweenSettings.asset | ||
| DOTweenSettings.asset.meta | ||
| Materials.meta | ||
| Prefabs.meta | ||
| Sprites.meta | ||
| UI.meta | ||