From cc9165246a38956f7174c6035feecfda717614f0 Mon Sep 17 00:00:00 2001
From: Alexsander Hamir <alexsanderhamirgomesbaptista@gmail.com>
Date: Thu, 5 Feb 2026 17:18:24 -0800
Subject: [PATCH] fix: resolve poetry.lock merge conflict

Remove unresolved merge conflict markers (<<<<<<<, =======, >>>>>>>) that caused
'Invalid statement at line 8534' when running poetry install. The conflict was
in the [metadata] content-hash between branches.
---
 poetry.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5e926509d54..b37fd863431 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -8531,8 +8531,4 @@ utils = ["numpydoc"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.9,<4.0"
-<<<<<<< litellm_oss_staging_02_04_2026
-content-hash = "797603dcfef0a79781c7d3cba5dfe18f6aea4aa792220f47487ebc7bd04ae2e3"
-=======
 content-hash = "e5447e14dd37e324ac07a8fc6286d27e9a0d355ed93ebb24fc11e3f5df12fd3e"
->>>>>>> main