From b7043a85f6b1c2d7f6e64c2e3859ea4b2974fd0c Mon Sep 17 00:00:00 2001 From: shivam Date: Sat, 25 Apr 2026 11:29:30 -0700 Subject: [PATCH] fix merge conflict --- tests/test_litellm/proxy/auth/test_user_api_key_auth.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_litellm/proxy/auth/test_user_api_key_auth.py b/tests/test_litellm/proxy/auth/test_user_api_key_auth.py index f7d118de697..9c43ebcbe79 100644 --- a/tests/test_litellm/proxy/auth/test_user_api_key_auth.py +++ b/tests/test_litellm/proxy/auth/test_user_api_key_auth.py @@ -1839,7 +1839,10 @@ async def test_team_metadata_refreshed_from_team_object_during_auth(): finally: for k, v in _originals.items(): + setattr(_proxy_server_mod, k, v) + # --------------------------------------------------------------------------- + # _run_centralized_common_checks — centralized authz gate # ---------------------------------------------------------------------------