From cc510138cbbb6a6bb49ccc83ddea884bf638f58e Mon Sep 17 00:00:00 2001 From: Neil Martinsen-Burrell Date: Wed, 25 Jan 2023 11:48:55 -0600 Subject: [PATCH] Fix migrations merge conflict --- ..._domainapplication_federally_recognized_tribe_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/registrar/migrations/{0008_domainapplication_federally_recognized_tribe_and_more.py => 0009_domainapplication_federally_recognized_tribe_and_more.py} (86%) diff --git a/src/registrar/migrations/0008_domainapplication_federally_recognized_tribe_and_more.py b/src/registrar/migrations/0009_domainapplication_federally_recognized_tribe_and_more.py similarity index 86% rename from src/registrar/migrations/0008_domainapplication_federally_recognized_tribe_and_more.py rename to src/registrar/migrations/0009_domainapplication_federally_recognized_tribe_and_more.py index 6fd059128..e1f503364 100644 --- a/src/registrar/migrations/0008_domainapplication_federally_recognized_tribe_and_more.py +++ b/src/registrar/migrations/0009_domainapplication_federally_recognized_tribe_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.5 on 2023-01-18 21:11 +# Generated by Django 4.1.5 on 2023-01-25 17:48 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("registrar", "0007_domainapplication_more_organization_information_and_more"), + ("registrar", "0008_remove_userprofile_created_at_and_more"), ] operations = [