From 417bea59a90600f1ab3c93a937a49a936a5acf9d Mon Sep 17 00:00:00 2001 From: anperederi Date: Fri, 9 Jun 2023 15:39:41 +0200 Subject: [PATCH] :sparkles: add opposition feature --- .../Banquale/Views/Balance/BalancePage.xaml | 4 -- .../Views/Balance/BalancePage.xaml.cs | 4 -- .../Banquale/Views/TransactionsPage.xaml | 14 +++++- .../Banquale/Views/TransactionsPage.xaml.cs | 46 +++++++++++++++++-- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml index f69f567..f756e23 100644 --- a/src/Banquale/Banquale/Views/Balance/BalancePage.xaml +++ b/src/Banquale/Banquale/Views/Balance/BalancePage.xaml @@ -22,10 +22,6 @@ RowDefinitions="auto, 35, *" ColumnDefinitions="250, auto"> -<<<<<<< HEAD -======= - ->>>>>>> 55ea5ef38724b058c90869c8f83110399f1104d6