From 799d4e8f235e15e930e81b05d0bf3dc990dfba37 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Tue, 9 May 2023 17:20:11 +0200
Subject: [PATCH] resolve the issue of the merge with xaml/categ-page

---
 src/Banquale/Banquale/Views/ConnectionPage.xaml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml
index 0deb341..ec61893 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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="Banquale.Views.ConnectionPage"
@@ -109,11 +109,5 @@
         </Grid>
 
     </Grid>-->
-<<<<<<< HEAD
 
-    
-        
-        
-=======
->>>>>>> origin/master
 </ContentPage>
\ No newline at end of file