Skip to content

Commit 610e9de

Browse files
committed
Merge branch 'WelcomeWindow' of github.com:onesounds/Flow.Launcher into pr/849
� Conflicts: � Flow.Launcher/WelcomeWindow.xaml.cs
2 parents 0d6a9c7 + 85fbdd1 commit 610e9de

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Flow.Launcher.Resources.Pages
2727
/// <summary>
2828
/// WelcomePage1.xaml에 대한 상호 작용 논리
2929
/// </summary>
30-
public partial class WelcomePage1 : Page
30+
public partial class WelcomePage1
3131
{
3232
private bool initialize = false;
3333

Flow.Launcher/Resources/Pages/WelcomePage3.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
77
xmlns:ui="http://schemas.modernwpf.com/2019"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:ui="http://schemas.modernwpf.com/2019"
910
Title="WelcomePage3"
1011
mc:Ignorable="d">
1112
<Page.Resources>

Flow.Launcher/Resources/Pages/WelcomePage4.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
77
xmlns:ui="http://schemas.modernwpf.com/2019"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:ui="http://schemas.modernwpf.com/2019"
910
Title="WelcomePage4"
1011
d:DesignHeight="450"
1112
d:DesignWidth="800"

Flow.Launcher/Resources/Pages/WelcomePage5.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
77
xmlns:ui="http://schemas.modernwpf.com/2019"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:ui="http://schemas.modernwpf.com/2019"
910
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
1011
Title="WelcomePage5"
1112
d:DesignHeight="450"

0 commit comments

Comments
 (0)