From e48dde7b9b28c29a31f3d33452db75d9989813b2 Mon Sep 17 00:00:00 2001
From: yassin <yassin@berri.ai>
Date: Wed, 16 Sep 2026 16:28:13 +0000
Subject: [PATCH] fix(tests): drop leftover merge markers in test_handle_jwt

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 tests/test_litellm/proxy/auth/test_handle_jwt.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_litellm/proxy/auth/test_handle_jwt.py b/tests/test_litellm/proxy/auth/test_handle_jwt.py
index a6d5dc007a8..15defb196af 100644
--- a/tests/test_litellm/proxy/auth/test_handle_jwt.py
+++ b/tests/test_litellm/proxy/auth/test_handle_jwt.py
@@ -7111,8 +7111,6 @@ def test_check_scope_based_access_denial_hides_scope_allowlist_from_client():
     assert exc_info.value.status_code == 403
     assert exc_info.value.detail == {"error": _JWT_DENIED_CLIENT_MESSAGE}
     assert exc_info.value.internal_message == "model=gpt-5.6 not allowed. Allowed_models=['gpt-5.6-mini']"
-||||||| 24153b5f29
-=======
 
 
 @pytest.mark.asyncio