Skip to content

fix: remove merge conflict marker in runtime.py #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tptpp merged 1 commit into from
Mar 30, 2026
Merged

fix: remove merge conflict marker in runtime.py #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,6 @@ async def _execute_stream(
f"[_execute_stream] Injected interaction gateway into agent"
)

<<<<<<< HEAD
# 注入 GptsMemory（用于VIS推送）- backup in case _get_or_create_agent missed it
if self.gpts_memory and hasattr(agent, "set_gpts_memory"):
if not getattr(agent, "_gpts_memory", None):
Expand Down
Loading