Fix merge

This commit is contained in:
GolfOcean334
2024-04-11 09:19:20 +02:00
parent 1104f7adbe
commit 1345537486
2 changed files with 32 additions and 71 deletions

View File

@@ -188,7 +188,6 @@
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="..\..\..\..\Downloads\grass.tga" />
<CopyFileToFolders Include="alpha01.tga" />
<Image Include="dirt01.tga" />
<CopyFileToFolders Include="font01.tga" />
@@ -206,10 +205,10 @@
<Image Include="wall.tga" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="..\..\..\..\Downloads\chunk.txt" />
<CopyFileToFolders Include="cube.txt" />
<CopyFileToFolders Include="font01.txt" />
<CopyFileToFolders Include="plane.txt" />
<Text Include="chunk.txt" />
<Text Include="sphere.txt" />
<CopyFileToFolders Include="sprite_data_01.txt" />
<Text Include="square.txt" />