# Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json |
||
|---|---|---|
| .. | ||
| UI | ||
| ClientPreferencesManager.cs | ||
| IClientPreferencesManager.cs | ||
| LobbyState.cs | ||
| LobbyUIController.cs | ||
# Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json |
||
|---|---|---|
| .. | ||
| UI | ||
| ClientPreferencesManager.cs | ||
| IClientPreferencesManager.cs | ||
| LobbyState.cs | ||
| LobbyUIController.cs | ||