fix merge issues

Author: CaymanWilliams

databricks/sdk/_base_client.py

@@ -276,6 +276,7 @@ def _perform(self,
         error = self._error_parser.get_api_error(response)
         if error is not None:
             raise error from None
+
         return response
 
     def _record_request_log(self, response: requests.Response, raw: bool = False) -> None:

databricks/sdk/credentials_provider.py

@@ -189,6 +189,7 @@ def token() -> Token:
 def external_browser(cfg: 'Config') -> Optional[CredentialsProvider]:
     if cfg.auth_type != 'external-browser':
         return None
+
     client_id, client_secret = None, None
     if cfg.client_id:
         client_id = cfg.client_id