From 7859db043209a2fb380a2860500f3bb872fc1b69 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 14 Oct 2025 18:43:47 +0800
Subject: [PATCH] Resolve conflicts

---
 .../SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs
index 28ee51bb9..d7f5b6329 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs
@@ -73,8 +73,6 @@ public partial class SettingsPaneHotkeyViewModel : BaseModel
         if (index >= 0 && index < Settings.CustomPluginHotkeys.Count)
         {
             Settings.CustomPluginHotkeys[index] = new CustomPluginHotkey(window.Hotkey, window.ActionKeyword);
-            HotKeyMapper.RemoveHotkey(settingItem.Hotkey); // remove origin hotkey
-            HotKeyMapper.SetCustomQueryHotkey(Settings.CustomPluginHotkeys[index]); // set new hotkey
         }
     }