Fix merge conflicts

This commit is contained in:
Aleh Khantsevich
2024-08-19 20:50:14 +02:00
74 changed files with 1969 additions and 640 deletions

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,12 @@
using Wino.Views.Abstract;
namespace Wino.Views.Settings
{
public sealed partial class AliasManagementPage : AliasManagementPageAbstract
{
public AliasManagementPage()
{
this.InitializeComponent();
}
}
}