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

updated migration with merge conflict

Browse source
This commit is contained in:
Alysia Broddrick 2024-03-13 14:08:58 -07:00
parent f9360bec20
commit d356e4879d
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/registrar/migrations/0075_alter_domaininformation_other_contacts_and_more.py → src/registrar/migrations/0076_alter_domainrequest_current_websites_and_more.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.10 on 2024-03-09 11:32 # Generated by Django 4.2.10 on 2024-03-13 21:07
from django.db import migrations, models from django.db import migrations, models
@ -6,20 +6,10 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0074_create_groups_v08"), ("registrar", "0075_create_groups_v08"),
] ]
operations = [ operations = [
migrations.AlterField(
model_name="domaininformation",
name="other_contacts",
field=models.ManyToManyField(
blank=True,
related_name="contact_domain_requests_information",
to="registrar.contact",
verbose_name="Other employees",
),
),
migrations.AlterField( migrations.AlterField(
model_name="domainrequest", model_name="domainrequest",
name="current_websites", name="current_websites",