|
|
@ -27,19 +27,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
<ItemGroup>
|
|
|
|
<None Remove="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
|
|
|
|
<None Remove="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.SqlServer" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.SqlServer" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.Tools" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.Tools" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.Sqlite" />
|
|
|
|
<None Remove="Microsoft.EntityFrameworkCore.Sqlite" />
|
|
|
|
</ItemGroup>
|
|
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
|
|
<None Update="bowling.db">
|
|
|
|
|
|
|
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
|
|
|
|
|
|
</None>
|
|
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> origine/Branche1
|
|
|
|
|
|
|
|
</Project>
|
|
|
|
</Project>
|
|
|
|