Resolve merge conflicts

2026-01-29 23:18:13 +01:00
parent 4ea4bd9bbf deaa68880a
commit c6a43a21f7
18 changed files with 1187 additions and 15 deletions
--- a/SkyTeam/SkyTeam.csproj
+++ b/SkyTeam/SkyTeam.csproj
@@ -9,7 +9,11 @@
  </PropertyGroup>

  <ItemGroup>
+<<<<<<< HEAD
    <PackageReference Include="MySql.Data" Version="9.6.0" />
+=======
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="6.2.1" />
+>>>>>>> deaa68880afaf3dd53903180eef7a43c3e23056a
  </ItemGroup>

 </Project>