From d777169d3dd82c99287313dc6e57ef21efc00b3b Mon Sep 17 00:00:00 2001 From: agustin18 Date: Wed, 30 Sep 2026 04:11:20 +0000 Subject: [PATCH] test(responses): remove leftover conflict marker in responses transformation test --- ...ion_extras_litellm_responses_transformation_transformation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py index c7803363e34..698a40aedd3 100644 --- a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py +++ b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py @@ -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", [