conflict

landing-ai · Aug 26, 2024 · 3385c7b · 3385c7b
1 parent 8cf97fa
commit 3385c7b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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