From fb4ca48fd4702757298df72485fcd3d4248f6360 Mon Sep 17 00:00:00 2001
From: "camille.turpin-etienne" <camille.turpin-etienne@etu.uca.fr>
Date: Fri, 12 Apr 2024 16:33:13 +0200
Subject: [PATCH] Merge de joueur dans master

---
 MauiSpark/Pages/Egalite.xaml         | 22 ----------------------
 MauiSpark/Pages/TableauScore.xaml.cs | 11 -----------
 2 files changed, 33 deletions(-)

diff --git a/MauiSpark/Pages/Egalite.xaml b/MauiSpark/Pages/Egalite.xaml
index 71a7c39..cedbcdb 100644
--- a/MauiSpark/Pages/Egalite.xaml
+++ b/MauiSpark/Pages/Egalite.xaml
@@ -1,24 +1,3 @@
-<<<<<<<< HEAD:MauiSpark/Pages/Egaliter.xaml
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="mastermind.Pages.Egaliter"
-             xmlns:pages="clr-namespace:mastermind.Pages"
-             Title="Egaliter">
-    <VerticalStackLayout>
-        <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
-            <Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
-            <Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
-                <Label Text="Egaliter" Style="{StaticResource TexteTitre}"/>
-            </Frame>
-            <Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
-        </FlexLayout>
-        <Frame Margin="20">
-            <Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps" Style="{StaticResource TexteFrame}"/>
-        </Frame>
-        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
-    </VerticalStackLayout>
-========
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -38,5 +17,4 @@
         </Frame>
         <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
     </VerticalStackLayout>
->>>>>>>> master:MauiSpark/Pages/Egalite.xaml
 </ContentPage>
\ No newline at end of file
diff --git a/MauiSpark/Pages/TableauScore.xaml.cs b/MauiSpark/Pages/TableauScore.xaml.cs
index cdd494e..db2de05 100644
--- a/MauiSpark/Pages/TableauScore.xaml.cs
+++ b/MauiSpark/Pages/TableauScore.xaml.cs
@@ -1,13 +1,3 @@
-<<<<<<<< HEAD:MauiSpark/Pages/tableauScore.xaml.cs
-namespace mastermind.Pages;
-
-public partial class TableauScore : ContentPage
-{
-	public TableauScore()
-	{
-		InitializeComponent();
-	}
-========
 namespace MauiSpark.Pages;
 
 public partial class TableauScore : ContentPage
@@ -16,5 +6,4 @@ public partial class TableauScore : ContentPage
 	{
 		InitializeComponent();
 	}
->>>>>>>> master:MauiSpark/Pages/TableauScore.xaml.cs
 }
\ No newline at end of file