From 7dc4f149a70c09cab3d458e684067727a2e10ccc Mon Sep 17 00:00:00 2001
From: thedoubl3j <jljacks93@gmail.com>
Date: Thu, 4 Sep 2025 15:17:54 -0400
Subject: [PATCH] Fix rebase merge conflicts

* had to rebase and accept both in some cases
* remove unused imports
---
 awx/api/views/__init__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index fbe535e869..1176fa8f4a 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -62,9 +62,6 @@ from wsgiref.util import FileWrapper
 # django-ansible-base
 from ansible_base.lib.utils.requests import get_remote_hosts
 from ansible_base.rbac.models import RoleEvaluation
-from ansible_base.resource_registry.shared_types import OrganizationType, TeamType, UserType
-from ansible_base.rbac.models import RoleEvaluation, ObjectRole
-from ansible_base.rbac import permission_registry
 
 # AWX
 from awx.main.tasks.system import send_notifications, update_inventory_computed_fields