squash!: Fix conflicts

rodmgwgu · rodmgwgu · commit 1208048f4e85 · 2026-04-15T15:38:35.000-06:00
diff --git a/openedx_authz/__init__.py b/openedx_authz/__init__.py
@@ -4,6 +4,6 @@
 
 import os
 
-__version__ = "1.8.0"
+__version__ = "1.9.0"
 
 ROOT_DIRECTORY = os.path.dirname(os.path.abspath(__file__))
diff --git a/openedx_authz/rest_api/v1/views.py b/openedx_authz/rest_api/v1/views.py
@@ -57,15 +57,15 @@
     AddUsersToRoleWithScopeSerializer,
     ListRolesWithScopeResponseSerializer,
     ListRolesWithScopeSerializer,
-    ListTeamMemberAssignmentsQuerySerializer,
     ListScopesQuerySerializer,
+    ListTeamMemberAssignmentsQuerySerializer,
     ListTeamMembersSerializer,
     ListUsersInRoleWithScopeSerializer,
     PermissionValidationResponseSerializer,
     PermissionValidationSerializer,
     RemoveUsersFromRoleWithScopeSerializer,
-    TeamMemberAssignmentSerializer,
     ScopeSerializer,
+    TeamMemberAssignmentSerializer,
     TeamMemberSerializer,
     UserRoleAssignmentSerializer,
     UserValidationAPIViewResponseSerializer,
