From d1b279ffb525576caab9d5d32fea274c5b2f6577 Mon Sep 17 00:00:00 2001
From: mateo <mateo@berri.ai>
Date: Fri, 21 Aug 2026 02:39:25 +0000
Subject: [PATCH] fix(tests): drop leftover merge marker in team membership
 lockdown tests

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

diff --git a/tests/test_litellm/proxy/management_endpoints/test_common_utils.py b/tests/test_litellm/proxy/management_endpoints/test_common_utils.py
index 3bbd4f4476d..71201c41d31 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_common_utils.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_common_utils.py
@@ -1222,4 +1222,3 @@ class TestUpdateMetadataFieldsPremiumCheck:
         }
         _update_metadata_fields(updated_kv)
         mock_check.assert_called()
->>>>>>> origin/litellm_internal_staging