zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-18 18:39:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix migrations (merge conflict

Browse source
This commit is contained in:
zandercymatics 2024-10-03 13:06:12 -06:00
parent 2f8408e875
commit 8d0c1ba6bf
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/migrations/0129_remove_federalagency_initials_federalagency_acronym_and_more.py → src/registrar/migrations/0130_remove_federalagency_initials_federalagency_acronym_and_more.py
View file

@ -8,7 +8,7 @@ import registrar.models.federal_agency
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0128_alter_domaininformation_state_territory_and_more"), ("registrar", "0129_alter_portfolioinvitation_portfolio_roles_and_more"),
] ]
operations = [ operations = [

2
src/registrar/migrations/0130_create_groups_v17.py → src/registrar/migrations/0131_create_groups_v17.py
View file

@ -25,7 +25,7 @@ def create_groups(apps, schema_editor) -> Any:
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0129_remove_federalagency_initials_federalagency_acronym_and_more"), ("registrar", "0130_remove_federalagency_initials_federalagency_acronym_and_more"),
] ]
operations = [ operations = [

2
src/registrar/migrations/0131_alter_domaininformation_portfolio_and_more.py → src/registrar/migrations/0132_alter_domaininformation_portfolio_and_more.py
View file

@ -7,7 +7,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0130_create_groups_v17"), ("registrar", "0131_create_groups_v17"),
] ]
operations = [ operations = [