mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-05 17:28:31 +02:00
merge main and resolve migration conflicts
This commit is contained in:
parent
eac757a6a6
commit
08c42a6e8d
1 changed files with 1 additions and 1 deletions
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("registrar", "0117_alter_portfolioinvitation_portfolio_additional_permissions_and_more"),
|
||||
("registrar", "0118_alter_portfolio_options_alter_portfolio_creator_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
Loading…
Add table
Add a link
Reference in a new issue