# Conflicts: # Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua # Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua |
||
|---|---|---|
| .. | ||
| IndicationManager.lua | ||
| IndicationManager.lua.meta | ||
| NetManager.lua | ||
| NetManager.lua.meta | ||
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua # Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua |
||
|---|---|---|
| .. | ||
| IndicationManager.lua | ||
| IndicationManager.lua.meta | ||
| NetManager.lua | ||
| NetManager.lua.meta | ||