From 227d1a6e3ccacd3ca69e93e30cb47d9311e3c437 Mon Sep 17 00:00:00 2001
From: Darius <Darius.BERTRAND@etu.uca.fr>
Date: Sat, 3 Dec 2022 10:41:40 +0100
Subject: [PATCH] merge

---
 ProjetBlazor/Program.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ProjetBlazor/Program.cs b/ProjetBlazor/Program.cs
index 47997d8..65b7322 100644
--- a/ProjetBlazor/Program.cs
+++ b/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();