From 07075075305966eb39544a193c0185f76fd23bcd Mon Sep 17 00:00:00 2001
From: Darius <Darius.BERTRAND@etu.uca.fr>
Date: Sat, 10 Dec 2022 09:13:38 +0100
Subject: [PATCH] correction merge

---
 ProjetBlazor/ProjetBlazor.csproj  | 5 +----
 ProjetBlazor/Shared/NavMenu.razor | 8 +++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ProjetBlazor/ProjetBlazor.csproj b/ProjetBlazor/ProjetBlazor.csproj
index 91e5684..1669763 100644
--- a/ProjetBlazor/ProjetBlazor.csproj
+++ b/ProjetBlazor/ProjetBlazor.csproj
@@ -7,13 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
     <PackageReference Include="Blazorise.Bootstrap" Version="1.1.4.1" />
     <PackageReference Include="Blazorise.DataGrid" Version="1.1.4.1" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
-=======
     <Folder Include="wwwroot\images\" />
->>>>>>> 3440c9059da8cb9c6643c5187eb805ec45f4ec18
   </ItemGroup>
-
+  
 </Project>
diff --git a/ProjetBlazor/Shared/NavMenu.razor b/ProjetBlazor/Shared/NavMenu.razor
index 74a49eb..1ec3a32 100644
--- a/ProjetBlazor/Shared/NavMenu.razor
+++ b/ProjetBlazor/Shared/NavMenu.razor
@@ -14,15 +14,17 @@
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </div>
-<<<<<<< HEAD
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="MusiquesListe">
                 <span class="oi oi-plus" aria-hidden="true"></span> MusiquesListe
-=======
          <div class="nav-item px-3">
             <NavLink class="nav-link" href="edit/5/">
                 <span class="oi oi-plus" aria-hidden="true"></span> Edit
->>>>>>> 3440c9059da8cb9c6643c5187eb805ec45f4ec18
+            </NavLink>
+        </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="fetchdata">
+                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
             </NavLink>
         </div>
     </nav>