Rebase conflict resolutions

AlanCoding · Feb 1, 2024 · 9565674 · 9565674
1 parent 858bf73
commit 9565674
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/test_app/admin.py b/test_app/admin.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import Group
 
-from test_app.models import EncryptionModel, Organization, Team, User, CollectionImport, ExampleEvent, InstanceGroup, Inventory, Namespace
+from test_app.models import CollectionImport, EncryptionModel, ExampleEvent, InstanceGroup, Inventory, Namespace, Organization, Team, User
 
 admin.site.register(EncryptionModel)
 admin.site.register(Organization)

diff --git a/test_app/migrations/0003_remove_organization_users.py b/test_app/migrations/0003_remove_organization_users.py
diff --git a/test_app/views.py b/test_app/views.py
@@ -1,8 +1,8 @@
 from rest_framework import permissions
 from rest_framework.decorators import action
+from rest_framework.response import Response
 from rest_framework.routers import SimpleRouter
 from rest_framework.viewsets import ModelViewSet
-from rest_framework.response import Response
 
 from ansible_base.rbac.api.permissions import AnsibleBaseObjectPermissions
 from test_app.models import User