fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.vcxproj

@@ -30,14 +30,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

@@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>