From 3385c7b50f6bf2174c0b073afcc10af36e4a3775 Mon Sep 17 00:00:00 2001
From: Mingrui Zhang <mingruizhang50@gmail.com>
Date: Mon, 26 Aug 2024 18:09:11 +0800
Subject: [PATCH] conflict

---
 vision_agent/tools/tools.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vision_agent/tools/tools.py b/vision_agent/tools/tools.py
index 4b1f27f0..0f16d3e9 100644
--- a/vision_agent/tools/tools.py
+++ b/vision_agent/tools/tools.py
@@ -19,11 +19,8 @@
     get_tool_descriptions_by_names,
     get_tool_documentation,
     get_tools_df,
-<<<<<<< HEAD
-    send_inference_request,
-=======
     get_tools_info,
->>>>>>> 58115951f8a050c9f9f7be2012efe97ec00498ed
+    send_inference_request,
 )
 from vision_agent.utils import extract_frames_from_video
 from vision_agent.utils.execute import FileSerializer, MimeType