merge conflicting migrations

This commit is contained in:
Rachid Mrad 2023-10-18 18:03:22 -04:00
parent 20157e2e99
commit d01bebec41
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF

View file

@ -0,0 +1,12 @@
# Generated by Django 4.2.1 on 2023-10-18 22:03
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("registrar", "0039_alter_transitiondomain_status"),
("registrar", "0039_merge_20231013_2029"),
]
operations = []