resolve the issue of the merge with xaml/categ-page

2 years ago · 799d4e8f23
parent 5d3d33acbd
commit 799d4e8f23
1 changed files with 1 additions and 7 deletions
--- 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>