diff --git a/MainWindow.xaml b/MainWindow.xaml index 1e47016..cc20df3 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -5,12 +5,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:SUNLIGHT_CDKEY" mc:Ignorable="d" -<<<<<<< HEAD -<<<<<<< HEAD Title="MainWindow" Height="400" Width="600"> - + @@ -23,25 +21,17 @@ - + - + - +