fix migrations (merge conflict

cisagov · Oct 3, 2024 · 8d0c1ba · 8d0c1ba
1 parent 2f8408e
commit 8d0c1ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...nitials_federalagency_acronym_and_more.py → ...nitials_federalagency_acronym_and_more.py b/...nitials_federalagency_acronym_and_more.py → ...nitials_federalagency_acronym_and_more.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0128_alter_domaininformation_state_territory_and_more"),
+        ("registrar", "0129_alter_portfolioinvitation_portfolio_roles_and_more"),
     ]
 
     operations = [

diff --git a/...trar/migrations/0130_create_groups_v17.py → ...trar/migrations/0131_create_groups_v17.py b/...trar/migrations/0130_create_groups_v17.py → ...trar/migrations/0131_create_groups_v17.py
@@ -25,7 +25,7 @@ def create_groups(apps, schema_editor) -> Any:
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0129_remove_federalagency_initials_federalagency_acronym_and_more"),
+        ("registrar", "0130_remove_federalagency_initials_federalagency_acronym_and_more"),
     ]
 
     operations = [

diff --git a/...r_domaininformation_portfolio_and_more.py → ...r_domaininformation_portfolio_and_more.py b/...r_domaininformation_portfolio_and_more.py → ...r_domaininformation_portfolio_and_more.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0130_create_groups_v17"),
+        ("registrar", "0131_create_groups_v17"),
     ]
 
     operations = [