Mise à jour de 'WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor'

4 months ago · f6392cc406
parent 7f7a894e6f
commit f6392cc406
1 changed files with 18 additions and 22 deletions
--- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
@ -8,13 +8,9 @@
    </div>

    <main>
-<<<<<<< HEAD
        <div class="top-row-app px-4">
            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
        </div>
-
-=======
->>>>>>> a5f669a3101747ffe3b2b969d580060ac8954bad
        <article class="content px-4">
            @Body
        </article>