# Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/TagManager.asset |
||
---|---|---|
.. | ||
Core | ||
Editor | ||
Usage | ||
Core.meta | ||
Editor.meta | ||
Usage.meta | ||
license.txt | ||
license.txt.meta |
# Conflicts: # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/TagManager.asset |
||
---|---|---|
.. | ||
Core | ||
Editor | ||
Usage | ||
Core.meta | ||
Editor.meta | ||
Usage.meta | ||
license.txt | ||
license.txt.meta |