Merged PR 6426: SYNC: GH main to ADO main

bewithgaurav · bewithgaurav · commit 3fb8ab252b66 · 2025-11-11T09:06:17.000Z
Related work items: #39534
diff --git a/mssql_python/helpers.py b/mssql_python/helpers.py
@@ -343,8 +343,4 @@ def __init__(self) -> None:
 def get_settings() -> Settings:
     """Return the global settings object"""
     with _settings_lock:
-<<<<<<< HEAD
         return _settings
-=======
-        return _settings
->>>>>>> 8ed531e5161fbae39debf29b8e89363b1efaca31
