isort

Author: kellerza

office365/entity_collection.py

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 from typing import TYPE_CHECKING, Any, Optional, Type, TypeVar
+=======
+from typing import TYPE_CHECKING, Any, TypeVar
+>>>>>>> 3ecd282d (isort)
 
 from office365.entity import Entity
 from office365.runtime.client_object_collection import ClientObjectCollection

requirements.txt

@@ -3,4 +3,8 @@ requests_ntlm [NTLMAuthentication]
 setuptools==65.5.1
 msal==1.24.1
 pytz==2021.1
+<<<<<<< HEAD
 typing_extensions>=4.0.0;python_version<'3.11'
+=======
+typing_extensions
+>>>>>>> 3ecd282d (isort)