From 069a2435fa85d2950865b9463ce01f11372ab6df Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 28 May 2024 08:38:46 -0600 Subject: [PATCH] Merge latest and fix migrations (once again) --- src/registrar/migrations/0094_create_groups_v12.py | 2 +- ...ogether.py => 0096_alter_publiccontact_unique_together.py} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/registrar/migrations/{0094_alter_publiccontact_unique_together.py => 0096_alter_publiccontact_unique_together.py} (68%) diff --git a/src/registrar/migrations/0094_create_groups_v12.py b/src/registrar/migrations/0094_create_groups_v12.py index 42106cdb5..0a4e1f51f 100644 --- a/src/registrar/migrations/0094_create_groups_v12.py +++ b/src/registrar/migrations/0094_create_groups_v12.py @@ -25,7 +25,7 @@ def create_groups(apps, schema_editor) -> Any: class Migration(migrations.Migration): dependencies = [ - ("registrar", "0093_alter_publiccontact_unique_together"), + ("registrar", "0093_alter_contact_email_alter_contact_first_name_and_more"), ] operations = [ diff --git a/src/registrar/migrations/0094_alter_publiccontact_unique_together.py b/src/registrar/migrations/0096_alter_publiccontact_unique_together.py similarity index 68% rename from src/registrar/migrations/0094_alter_publiccontact_unique_together.py rename to src/registrar/migrations/0096_alter_publiccontact_unique_together.py index a18c077b9..21e2c8c23 100644 --- a/src/registrar/migrations/0094_alter_publiccontact_unique_together.py +++ b/src/registrar/migrations/0096_alter_publiccontact_unique_together.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.10 on 2024-05-28 14:34 +# Generated by Django 4.2.10 on 2024-05-28 14:38 from django.db import migrations @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ("registrar", "0093_alter_contact_email_alter_contact_first_name_and_more"), + ("registrar", "0095_user_middle_name_user_title"), ] operations = [