# Conflicts: # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/View/UpView.lua |
||
|---|---|---|
| .. | ||
| IndicationManager.lua | ||
| IndicationManager.lua.meta | ||
| NetManager.lua | ||
| NetManager.lua.meta | ||
# Conflicts: # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/View/UpView.lua |
||
|---|---|---|
| .. | ||
| IndicationManager.lua | ||
| IndicationManager.lua.meta | ||
| NetManager.lua | ||
| NetManager.lua.meta | ||