fix: remove conflict marker in google helper (#875)

2026-01-15 05:20:07 +00:00 · 2026-01-15 05:20:07 +00:00 · 738b3592cd
commit 738b3592cd
parent cd2af64860
1 changed files with 0 additions and 1 deletions
--- a/src/agents/pi-embedded-helpers/google.ts
+++ b/src/agents/pi-embedded-helpers/google.ts
@ -64,7 +64,6 @@ export function downgradeGeminiThinkingBlocks(messages: AgentMessage[]): AgentMe
      const trimmed = thinking.trim();
      hasDowngraded = true;
      if (!trimmed) return [];
-<<<<<<< HEAD
      return [{ type: "text" as const, text: thinking }];
    });