make migrations, fix conflict from merge

This commit is contained in:
David Kennedy 2023-09-12 10:16:22 -04:00
parent 6a2f1b0bc8
commit 889289f54e
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B

View file

@ -0,0 +1,12 @@
# Generated by Django 4.2.1 on 2023-09-12 14:12
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("registrar", "0031_alter_domain_state"),
("registrar", "0031_transitiondomain"),
]
operations = []