# Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml |
||
|---|---|---|
| .. | ||
| ServerContentIoC.cs | ||
| ServerModuleTestingCallbacks.cs | ||
# Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml |
||
|---|---|---|
| .. | ||
| ServerContentIoC.cs | ||
| ServerModuleTestingCallbacks.cs | ||