merge

ProjetBlazor/Program.cs

@@ -3,27 +3,20 @@ using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-<<<<<<< HEAD
-
-=======
 using ProjetBlazor.Services;
->>>>>>> 3440c9059da8cb9c6643c5187eb805ec45f4ec18
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
-<<<<<<< HEAD
 builder.Services
    .AddBlazorise()
    .AddBootstrapProviders()
    .AddFontAwesomeIcons();
-=======
 
 builder.Services.AddScoped<IDataService, DataApiService>();
 builder.Services.AddHttpClient();
->>>>>>> 3440c9059da8cb9c6643c5187eb805ec45f4ec18
 
 var app = builder.Build();