From 2caeb512a0ec2bde7cc2bcfb6e78b1476d7bcba7 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:42:00 -0700
Subject: [PATCH] Fix migration conflict

---
 ... => 0054_alter_domainapplication_federal_agency_and_more.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0048_alter_domainapplication_federal_agency_and_more.py => 0054_alter_domainapplication_federal_agency_and_more.py} (99%)

diff --git a/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py b/src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py
similarity index 99%
rename from src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py
rename to src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py
index e00d67cb5..d16c9befd 100644
--- a/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py
+++ b/src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
+        ("registrar", "0053_create_groups_v05"),
     ]
 
     operations = [