zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-30 01:10:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix migrations merge conflict

Browse source
This commit is contained in:
Neil Martinsen-Burrell 2023-01-25 11:48:55 -06:00
parent c5ada0437f
commit cc510138cb
No known key found for this signature in database
GPG key ID: 6A3C818CC10D0184
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/0008_domainapplication_federally_recognized_tribe_and_more.py → src/registrar/migrations/0009_domainapplication_federally_recognized_tribe_and_more.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.1.5 on 2023-01-18 21:11 # Generated by Django 4.1.5 on 2023-01-25 17:48
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", "0007_domainapplication_more_organization_information_and_more"), ("registrar", "0008_remove_userprofile_created_at_and_more"),
] ]
operations = [ operations = [