Conflicts: dotnet/Properties/AssemblyInfo.cs source/windows/WinMain.cpp Source commit: 32ebb8c765457368e9578e8f865e127d3449d853
Martin Prikryl