Khadija SALAK · 5f833869
--- a/NavalWar.API/NavalWar.API.csproj

+ 5

− 0

View file @ 5f833869

Open in Web IDE
+++ b/NavalWar.API/NavalWar.API.csproj

+ 5

− 0

View file @ 5f833869

Open in Web IDE
 @@ -7,12 +7,17 @@
  </PropertyGroup>

  <ItemGroup>
+<<<<<<< HEAD
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+=======
    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+>>>>>>> 0dd8f386ccb0ac197e934a3cda5b777ef8438489
  </ItemGroup>

  <ItemGroup>