From 0e944c4c89b12901668aba5baf6f7597f8b5c893 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Tue, 4 Apr 2023 22:51:08 +0200
Subject: [PATCH] resolve conflicts

---
 AppShell.xaml | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/AppShell.xaml b/AppShell.xaml
index 583bcf4..cd5acd4 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
     x:Class="ShoopNCook.AppShell"
@@ -21,34 +20,10 @@
             Title="Home Page"
             ContentTemplate="{DataTemplate views:HomePage}"
             Route="HomePage" />
+        <ShellContent
+            Title="Profile Page"
+            ContentTemplate="{DataTemplate views:ProfilePage}"
+            Route="Profile" />
     </TabBar>
-</Shell>
-=======
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="ShoopNCook.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:ShoopNCook"
-    xmlns:views="clr-namespace:ShoopNCook.Views"
-    Shell.FlyoutBehavior="Disabled"
-    Shell.NavBarIsVisible="False">
-
-    <TabBar>
-        <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate views:HomePage}"
-        Route="MainPage" />
-
-        <ShellContent
-        Title="Login Page"
-        ContentTemplate="{DataTemplate views:LoginPage}"
-        Route="LoginPage" />
-
-        <ShellContent
-        Title="Profile Page"
-        ContentTemplate="{DataTemplate views:ProfilePage}"
-        Route="Profile" />
-    </TabBar>
-</Shell>
->>>>>>> 461f50d02d99cd21e927ebe44faaef5129b9caa3
+
+</Shell>
\ No newline at end of file