test(responses): remove leftover conflict marker in responses transformation test

This commit is contained in:
agustin18 2026-09-30 04:11:20 +00:00
parent d40c33645a
commit d777169d3d

View file

@ -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",
[