From 6709ac9ddb91259f060657970086c05c50cde98e Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 13 Oct 2023 16:20:38 -0400
Subject: [PATCH] trick the sandbox by deleting a conflicting migration

---
 .../migrations/0035_alter_user_options.py     | 42 ++++++++++++++-
 ...napplication_organization_type_and_more.py | 52 -------------------
 2 files changed, 41 insertions(+), 53 deletions(-)
 delete mode 100644 src/registrar/migrations/0038_alter_domainapplication_organization_type_and_more.py

diff --git a/src/registrar/migrations/0035_alter_user_options.py b/src/registrar/migrations/0035_alter_user_options.py
index 7ed81cdf5..b76f07c5d 100644
--- a/src/registrar/migrations/0035_alter_user_options.py
+++ b/src/registrar/migrations/0035_alter_user_options.py
@@ -1,6 +1,6 @@
 # Generated by Django 4.2.1 on 2023-09-27 18:53
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -18,4 +18,44 @@ class Migration(migrations.Migration):
                 ]
             },
         ),
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="organization_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("federal", "Federal"),
+                    ("interstate", "Interstate"),
+                    ("state_or_territory", "State or territory"),
+                    ("tribal", "Tribal"),
+                    ("county", "County"),
+                    ("city", "City"),
+                    ("special_district", "Special district"),
+                    ("school_district", "School district"),
+                ],
+                help_text="Type of organization",
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="organization_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("federal", "Federal"),
+                    ("interstate", "Interstate"),
+                    ("state_or_territory", "State or territory"),
+                    ("tribal", "Tribal"),
+                    ("county", "County"),
+                    ("city", "City"),
+                    ("special_district", "Special district"),
+                    ("school_district", "School district"),
+                ],
+                help_text="Type of Organization",
+                max_length=255,
+                null=True,
+            ),
+        ),
     ]
diff --git a/src/registrar/migrations/0038_alter_domainapplication_organization_type_and_more.py b/src/registrar/migrations/0038_alter_domainapplication_organization_type_and_more.py
deleted file mode 100644
index bdbca82d8..000000000
--- a/src/registrar/migrations/0038_alter_domainapplication_organization_type_and_more.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated by Django 4.2.1 on 2023-10-12 19:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0037_create_groups_v01"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="domainapplication",
-            name="organization_type",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("federal", "Federal"),
-                    ("interstate", "Interstate"),
-                    ("state_or_territory", "State or territory"),
-                    ("tribal", "Tribal"),
-                    ("county", "County"),
-                    ("city", "City"),
-                    ("special_district", "Special district"),
-                    ("school_district", "School district"),
-                ],
-                help_text="Type of organization",
-                max_length=255,
-                null=True,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="domaininformation",
-            name="organization_type",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("federal", "Federal"),
-                    ("interstate", "Interstate"),
-                    ("state_or_territory", "State or territory"),
-                    ("tribal", "Tribal"),
-                    ("county", "County"),
-                    ("city", "City"),
-                    ("special_district", "Special district"),
-                    ("school_district", "School district"),
-                ],
-                help_text="Type of Organization",
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]