scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-08 22:21:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 78

fix: resolve poetry.lock merge conflict

Browse source 
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.
This commit is contained in:
Alexsander Hamir 2026-02-05 17:18:24 -08:00
parent 75e85f9aaf
commit cc9165246a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
poetry.lock generated
View file

@ -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