resolve conflicts

ParionsCuite/ParionsCuite/AppShell.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <Shell
     x:Class="ParionsCuite.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
@@ -11,14 +11,12 @@
     xmlns:info="clr-namespace:ParionsCuite"
     Shell.FlyoutBehavior="Disabled">
 
+
+    <TabBar>
         <ShellContent
         Title="Home"
         ContentTemplate="{DataTemplate local:MainPage}"
         Route="MainPage" />
-
+    </TabBar>
-    <ShellContent
-        Title="Test"
-        ContentTemplate="{DataTemplate pari:Parier}"
-        Route="Accueil" />
     
 </Shell>

ParionsCuite/ParionsCuite/MainPage.xaml

@@ -69,12 +69,18 @@
                     </Grid>
                     
                     <!-- 2e ligne -->
+<<<<<<< HEAD
                     <Grid Grid.Row="1">
                         <ContentView>
                             <info:Info/>
                         </ContentView>
                     </Grid>
                     
+=======
+                    <ContentView MaximumHeightRequest="1000" MinimumWidthRequest="1000" BackgroundColor="Blue">
+                        <views:Groupe/>
+                    </ContentView>
+>>>>>>> 643fd0854f33ee5fc5357ed1d6d9e281a27cb039
                 </Grid>
                 
              </Grid>

ParionsCuite/ParionsCuite/Views/Groupe.xaml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ParionsCuite.Views.Groupe">
+             x:Class="ParionsCuite.Views.Groupe"
+             >
     <VerticalStackLayout>
+<<<<<<< HEAD
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition/>
@@ -62,5 +64,12 @@
             </Grid>
           <Button Grid.Row="5" Text="Creer événement" Margin="10"/>
         </Grid>
+=======
+        <Label 
+            Text="Hey hey test mg"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+         <Image Source="Resources/Images/dornet_bot.svg"/>
+>>>>>>> 643fd0854f33ee5fc5357ed1d6d9e281a27cb039
     </VerticalStackLayout>
 </ContentView>