Resolving merge conflicts.

This commit is contained in:
BDisp
2024-07-11 11:20:22 +01:00
111 changed files with 2197 additions and 3824 deletions

View File

@@ -13,4 +13,7 @@
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
</ItemGroup>
</Project>