merge main and resolve migration conflicts

This commit is contained in:
Matthew Spence 2024-08-21 12:28:41 -05:00
parent eac757a6a6
commit 08c42a6e8d
No known key found for this signature in database

View file

@ -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 = [