From 889289f54e0f750d8ce71642c9af43fc3b64b7e9 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Tue, 12 Sep 2023 10:16:22 -0400 Subject: [PATCH] make migrations, fix conflict from merge --- ..._0031_alter_domain_state_0031_transitiondomain.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/registrar/migrations/0032_merge_0031_alter_domain_state_0031_transitiondomain.py diff --git a/src/registrar/migrations/0032_merge_0031_alter_domain_state_0031_transitiondomain.py b/src/registrar/migrations/0032_merge_0031_alter_domain_state_0031_transitiondomain.py new file mode 100644 index 000000000..4c0a38427 --- /dev/null +++ b/src/registrar/migrations/0032_merge_0031_alter_domain_state_0031_transitiondomain.py @@ -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 = []