minor fix merge

This commit is contained in:
Lev 2024-08-15 15:36:01 +03:00
parent 8dbce7b229
commit e20256dc4a

View file

@ -21,13 +21,10 @@
<ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
<<<<<<< HEAD
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MonogameLibrary\MonogameLibrary.csproj" />
=======
>>>>>>> CollisionManager
</ItemGroup>
<ItemGroup>
<Folder Include="Content\Texture\GUI\" />