resolve merge conflicts

This commit is contained in:
David Refoua
2022-09-11 09:56:40 +04:30
2 changed files with 2 additions and 0 deletions

View File

@ -117,6 +117,7 @@ if ($ConEmuXml -ne "") {
Pop-Location
if($Compile) {
cmd.exe /C "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
Push-Location -Path $launcher
Create-RC $version ($launcher + '\src\version.rc2');
msbuild CmderLauncher.vcxproj /t:Clean,Build /p:configuration=Release