Resolution bug

ParionsCuite/ParionsCuite/MainPage.xaml

@@ -69,18 +69,12 @@
                     </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/MainPage.xaml.cs

@@ -6,7 +6,7 @@ public partial class MainPage : ContentPage
 
 	public MainPage()
 	{
-		InitializeComponent();
+        InitializeComponent();
 	}
 }
 

ParionsCuite/ParionsCuite/Views/Groupe.xaml

@@ -4,7 +4,6 @@
              x:Class="ParionsCuite.Views.Groupe"
              >
     <VerticalStackLayout>
-<<<<<<< HEAD
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition/>
@@ -64,12 +63,10 @@
             </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>