Resolve conflicts for merge

This commit is contained in:
2025-09-04 20:27:45 +02:00
7 changed files with 631 additions and 618 deletions

View File

@@ -11358,7 +11358,6 @@ void TMoverParameters::LoadFIZ_FFList( std::string const &Input ) {
extract_value( RlistSize, "Size", Input, "" );
}
void TMoverParameters::LoadFIZ_WiperList(std::string const &Input)
{
extract_value(WiperListSize, "Size", Input, "");