diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor index b1a9fbd..d71c742 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor @@ -1,9 +1,8 @@ @page "/" -Index +WikiFantasy

Hello, world!

Welcome to your new app. - diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 8113b6e..55b9b26 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -8,10 +8,13 @@
+<<<<<<< HEAD +======= +>>>>>>> a5f669a3101747ffe3b2b969d580060ac8954bad
@Body
diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index 226024f..88a076c 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -1,6 +1,6 @@