From 8cf4a0d3ad7ab763ad46a3e6e5185ceb11aeb9ba Mon Sep 17 00:00:00 2001 From: Novice Date: Mon, 20 Oct 2025 10:54:02 +0800 Subject: [PATCH] chore: handle merge conflict --- api/core/tools/tool_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py index 5ab32ecad4..0641fa01fe 100644 --- a/api/core/tools/tool_manager.py +++ b/api/core/tools/tool_manager.py @@ -24,7 +24,7 @@ from core.tools.plugin_tool.provider import PluginToolProviderController from core.tools.plugin_tool.tool import PluginTool from core.tools.utils.uuid_utils import is_valid_uuid from core.tools.workflow_as_tool.provider import WorkflowToolProviderController -from core.workflow.entities.variable_pool import VariablePool +from core.workflow.runtime.variable_pool import VariablePool from extensions.ext_database import db from models.provider_ids import ToolProviderID from services.enterprise.plugin_manager_service import PluginCredentialType