# Conflicts: # README.md # src/Ryujinx/Assets/locales.json # src/Ryujinx/Headless/HeadlessRyujinx.cs # src/Ryujinx/Headless/Windows/WindowBase.cs # src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs # src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs