9604 fix migration merge

This commit is contained in:
Arthur Hanson 2024-10-21 11:54:06 -07:00
parent 97f0f158db
commit 51296bb6bb
2 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,7 @@ def copy_site_assignments(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('circuits', '0045_circuit_distance'), ('circuits', '0046_charfield_null_choices'),
('contenttypes', '0002_remove_content_type_name'), ('contenttypes', '0002_remove_content_type_name'),
('dcim', '0193_poweroutlet_color'), ('dcim', '0193_poweroutlet_color'),
] ]

View File

@ -22,7 +22,7 @@ def populate_denormalized_fields(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('circuits', '0046_circuittermination__scope'), ('circuits', '0047_circuittermination__scope'),
] ]
operations = [ operations = [