From 8ec33bb67f342062cac5f263ed2ba003f25bb34f Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Thu, 12 Feb 2026 14:38:41 +0100
Subject: [PATCH] Resolve conflicts

---
 .../Controls/ShortcutControl/ShortcutControl.xaml.cs  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs
index 383978f628..b8aad6c323 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs
@@ -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;