From 415a8ab9a6dbc5e2d011850c248a6e3bba4e546f Mon Sep 17 00:00:00 2001 From: Alexsander Hamir Date: Sat, 6 Dec 2025 05:38:16 -0800 Subject: [PATCH] Fix: remove merge markdown (#17586) --- tests/basic_proxy_startup_tests/test_basic_proxy_startup.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/basic_proxy_startup_tests/test_basic_proxy_startup.py b/tests/basic_proxy_startup_tests/test_basic_proxy_startup.py index 62dd3297da..db09e38ea9 100644 --- a/tests/basic_proxy_startup_tests/test_basic_proxy_startup.py +++ b/tests/basic_proxy_startup_tests/test_basic_proxy_startup.py @@ -25,10 +25,6 @@ async def test_health_and_chat_completion(): readiness_response = await response.json() assert readiness_response["status"] == "connected" -<<<<<<< HEAD - -======= ->>>>>>> parent of d89990e0c5 (Add license metadata to health/readiness endpoint. (#15997)) # Test liveness endpoint async with session.get("http://0.0.0.0:4000/health/liveness") as response: assert response.status == 200