From 95656741d7d6b493f24feda4aaa8c7907b3776db Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Thu, 1 Feb 2024 14:42:16 -0500
Subject: [PATCH] Rebase conflict resolutions

---
 test_app/admin.py                               |  2 +-
 .../0003_remove_organization_users.py           | 17 -----------------
 test_app/views.py                               |  2 +-
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 test_app/migrations/0003_remove_organization_users.py

diff --git a/test_app/admin.py b/test_app/admin.py
index 35ef1c8c0..1d3da465f 100644
--- 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
deleted file mode 100644
index f0c2a698b..000000000
--- a/test_app/migrations/0003_remove_organization_users.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 4.2.8 on 2024-01-31 17:26
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('test_app', '0002_singleton_roles'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='organization',
-            name='users',
-        ),
-    ]
diff --git a/test_app/views.py b/test_app/views.py
index a262aa10f..82567b511 100644
--- 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