minor fix merge
This commit is contained in:
parent
8dbce7b229
commit
e20256dc4a
1 changed files with 0 additions and 3 deletions
|
@ -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\" />
|
||||
|
|
Loading…
Add table
Reference in a new issue