Modify files

src/Banquale/Banquale/Model/Transactions.cs

@@ -1,10 +1,4 @@
-using Org.Apache.Http.Cookies;
+using System.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Banquale.Model
 {

src/Banquale/Banquale/Views/BalancePage.xaml

@@ -28,7 +28,7 @@
                 BackgroundColor="AliceBlue"
                 Margin="0, 15, 0, 0"/>
             <Label
-                Text="{Binding Nom}"
+                Text="{Binding Name}"
                 Grid.Row="1"
                 Grid.ColumnSpan="2"
                 HorizontalOptions="Center"
@@ -42,7 +42,7 @@
                     TextColor="Black"
                     HorizontalOptions="Center"/>
                 <Label
-                    Text="{Binding Solde}"
+                    Text="{Binding Balance}"
                     Grid.Column="1"
                     MinimumWidthRequest="70"
                     TextColor="Black"

src/Banquale/Banquale/Views/BalancePage.xaml.cs

@@ -9,11 +9,7 @@ public partial class BalancePage : ContentPage
     public BalancePage()
 	{
 		InitializeComponent();
-<<<<<<< HEAD
+		BindingContext = new Account(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004"); ;
-		BindingContext = new Compte(999, "Tatouille", "FR76 9161 9581 6296 8415 2361 004"); ;
-		
-=======
->>>>>>> origin/master
 	}
 
 	public async void OnButtonClicked(object sender, EventArgs e)