Resolving conflicts with master

opengisch · Feb 18, 2023 · 93a9178 · 93a9178
2 parents ccdead4 + 2ac0d13
commit 93a9178
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pytransifex/api.py b/pytransifex/api.py
@@ -1,7 +1,7 @@
 import logging
 from os import mkdir
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
 
 import requests
 from transifex.api import transifex_api as tx_api
@@ -363,7 +363,7 @@ class Transifex:
 
     client = None
 
-    def __new__(cls, *, defer_login: bool = False, **kwargs) -> None | "Client":
+    def __new__(cls, *, defer_login: bool = False, **kwargs) -> Optional["Client"]:
         if not cls.client:
             try:
                 if kwargs: