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 @@ - + --> -<<<<<<< HEAD - - - -======= ->>>>>>> origin/master \ No newline at end of file