# Conflicts: # Assets/Editor/AutoPack.cs # Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt # Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png # Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua # Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua |
||
---|---|---|
.. | ||
IndicationManager.lua | ||
IndicationManager.lua.meta | ||
NetManager.lua | ||
NetManager.lua.meta |