Resolve conflicts

Jack251970 · Jack251970 · commit c00d804073b3 · 2025-10-15T13:07:43.000+08:00
diff --git a/Flow.Launcher/Helper/ResultHelper.cs b/Flow.Launcher/Helper/ResultHelper.cs
@@ -20,7 +20,7 @@ public static class ResultHelper
     {
         var plugin = PluginManager.GetPluginForId(pluginId);
         if (plugin == null) return null;
-        var query = QueryBuilder.Build(rawQuery, PluginManager.NonGlobalPlugins);
+        var query = QueryBuilder.Build(rawQuery, PluginManager.GetNonGlobalPlugins());
         if (query == null) return null;
         try
         {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class ResultHelper`
`20`	`20`	`{`
`21`	`21`	`var plugin = PluginManager.GetPluginForId(pluginId);`
`22`	`22`	`if (plugin == null) return null;`
`23`		`- var query = QueryBuilder.Build(rawQuery, PluginManager.NonGlobalPlugins);`
	`23`	`+ var query = QueryBuilder.Build(rawQuery, PluginManager.GetNonGlobalPlugins());`
`24`	`24`	`if (query == null) return null;`
`25`	`25`	`try`
`26`	`26`	`{`