mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-23 19:49:43 +01:00
Resolve conflicts
This commit is contained in:
@@ -402,17 +402,6 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
|
||||
_isActive = true;
|
||||
}
|
||||
|
||||
private void C_ResetClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
hotkeySettings = null;
|
||||
|
||||
SetValue(HotkeySettingsProperty, hotkeySettings);
|
||||
SetKeys();
|
||||
|
||||
lastValidSettings = hotkeySettings;
|
||||
shortcutDialog.Hide();
|
||||
}
|
||||
|
||||
private async void OpenDialogButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// c.Keys = null;
|
||||
|
||||
Reference in New Issue
Block a user