zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-16 06:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
zandercymatics 2024-04-15 11:47:42 -06:00
parent 05b6bcd181
commit 7013766d39
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/migrations/0084_domaininformation_cisa_representative_email_and_more.py → src/registrar/migrations/0085_domaininformation_cisa_representative_email_and_more.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.10 on 2024-04-15 17:30 # Generated by Django 4.2.10 on 2024-04-15 17:47
from django.db import migrations, models from django.db import migrations, models
@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0083_alter_contact_email_alter_publiccontact_email"), ("registrar", "0084_create_groups_v11"),
] ]
operations = [ operations = [