ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Error

Browse Source
This commit is contained in:
Rene Evertz
2024-06-18 13:46:27 +02:00
parent ade028d9e7
commit 5151c8ee44
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BeWo/BeWo.csproj
View File

@@ -3187,12 +3187,9 @@
<Resource Include="Ressources\Icons\Copy24.png" />
</ItemGroup>
<ItemGroup>
<<<<<<< HEAD
=======
<Resource Include="Ressources\Icons\CalendarDisabledUnderConstruction.png" />
</ItemGroup>
<ItemGroup>
>>>>>>> master
<Resource Include="Ressources\Icons\AB.png" />
</ItemGroup>
<ItemGroup>