From bc9c172b3c7e10b68a199ad5447c5bd066c8f5e7 Mon Sep 17 00:00:00 2001
From: zakrepashe <zakrepashe@gmail.com>
Date: Thu, 30 Jul 2026 15:23:21 +0300
Subject: [PATCH] fix(agent): drop leftover merge conflict markers in typing
 import

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/agent_loop.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/agent_loop.py b/src/agent_loop.py
index f4879edc5..368ad3211 100644
--- a/src/agent_loop.py
+++ b/src/agent_loop.py
@@ -12,11 +12,7 @@ import json
 import re
 import time
 import logging
-<<<<<<< HEAD
 from typing import Any, AsyncGenerator, Dict, List, Optional, Set
-=======
-from typing import Any, AsyncGenerator, List, Dict, Optional, Set
->>>>>>> upstream/dev
 from urllib.parse import urlparse
 
 from src.llm_core import (