N/A

GameAtlas/GameAtlas/Views/PageAccueil.xaml.cs

@@ -1,32 +0,0 @@
-using GameAtlas.Models;
-
-
-namespace GameAtlas.Views;
-
-
-public partial class PageAcceuil : ContentPage
-{
-	public Manager AccueilManager => (App.Current as App).MyManager;
-
-	public PageAcceuil()
-	{
-		InitializeComponent();
-
-        BindingContext = AccueilManager;
-    }
-
-    private async void OnProfil_Tapped(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageProfil());
-    }
-
-    private async void OnButtonClicked(object sender, EventArgs e)
-    {
-        var selectedjeu = (sender as ImageButton)?.BindingContext as Jeu;
-        if (selectedjeu != null)
-        {
-            await Navigation.PushAsync(new PageJeu(selectedjeu));
-        }
-    }
-
-}

GameAtlas/GameAtlas/Views/PageJeu.xaml.cs

@@ -25,6 +25,7 @@ public partial class PageJeu : ContentPage
 
         this.BindingContext = this;
 
+<<<<<<< HEAD
     }
 
     async void OnAddTapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
@@ -33,6 +34,8 @@ public partial class PageJeu : ContentPage
         Debug.WriteLine("Popup Action: " + action);
 
         //if (action == "")
+=======
+>>>>>>> origin/master
     }
 
     async void Back_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)