resolve merge confligts?
This commit is contained in:
@@ -31,8 +31,6 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="OpenTK.Input" Version="4.8.2" />
|
||||
<PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
|
||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="OpenTK" Version="4.8.2" />
|
||||
|
||||
Reference in New Issue
Block a user