mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-09 03:18:44 +00:00
test(responses): remove leftover conflict marker in responses transformation test
This commit is contained in:
parent
d40c33645a
commit
d777169d3d
1 changed files with 0 additions and 1 deletions
|
|
@ -4354,7 +4354,6 @@ def test_map_optional_params_verbosity_merges_into_text():
|
|||
assert verbosity_only_request["text"] == {"verbosity": "low"}
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
@pytest.mark.parametrize(
|
||||
"tool_call_id,is_custom",
|
||||
[
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue