From ea036eac1b9445d012680051ed9b72ffb844bd3b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 15 Sep 2023 17:11:47 -0400
Subject: [PATCH] fix migrations

---
 ...ainapplication_approved_domain_and_more.py | 37 -------------------
 .../0031_transitiondomain_and_more.py         | 27 +++++++++++++-
 2 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 src/registrar/migrations/0031_alter_domainapplication_approved_domain_and_more.py

diff --git a/src/registrar/migrations/0031_alter_domainapplication_approved_domain_and_more.py b/src/registrar/migrations/0031_alter_domainapplication_approved_domain_and_more.py
deleted file mode 100644
index 3a5957686..000000000
--- a/src/registrar/migrations/0031_alter_domainapplication_approved_domain_and_more.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 4.2.1 on 2023-09-06 20:30
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0030_alter_user_status"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="domainapplication",
-            name="approved_domain",
-            field=models.OneToOneField(
-                blank=True,
-                help_text="The approved domain",
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="domain_application",
-                to="registrar.domain",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="domaininformation",
-            name="domain",
-            field=models.OneToOneField(
-                blank=True,
-                help_text="Domain to which this information belongs",
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="domain_info",
-                to="registrar.domain",
-            ),
-        ),
-    ]
diff --git a/src/registrar/migrations/0031_transitiondomain_and_more.py b/src/registrar/migrations/0031_transitiondomain_and_more.py
index 79bf7eab4..b51fc27d3 100644
--- a/src/registrar/migrations/0031_transitiondomain_and_more.py
+++ b/src/registrar/migrations/0031_transitiondomain_and_more.py
@@ -1,6 +1,7 @@
-# Generated by Django 4.2.1 on 2023-09-13 22:25
+# Generated by Django 4.2.1 on 2023-09-15 21:05
 
 from django.db import migrations, models
+import django.db.models.deletion
 import django_fsm
 
 
@@ -105,6 +106,30 @@ class Migration(migrations.Migration):
                 protected=True,
             ),
         ),
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="approved_domain",
+            field=models.OneToOneField(
+                blank=True,
+                help_text="The approved domain",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="domain_application",
+                to="registrar.domain",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="domain",
+            field=models.OneToOneField(
+                blank=True,
+                help_text="Domain to which this information belongs",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="domain_info",
+                to="registrar.domain",
+            ),
+        ),
         migrations.AlterField(
             model_name="publiccontact",
             name="contact_type",