Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: incorrect merge stuff

Browse source
This commit is contained in:
Samuliak 2024-05-24 15:52:17 +02:00 • committed by Isaac Marovitz
parent 3ec45f73f4
commit 8eba42447f
2 changed files with 2 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Directory.Packages.props
View file

@ -38,11 +38,7 @@
<PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
<PackageVersion Include="shaderc.net" Version="0.1.0" />
<<<<<<< HEAD
<PackageVersion Include="SharpMetal" Version="1.0.0-preview14" />
=======
<PackageVersion Include="SharpMetal" Version="1.0.0-preview12" />
>>>>>>> 3eab14be7 (Set scissors & viewports)
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />