From b99c356d1d3bab9fd6c28371f26049f961bde52b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 11 Oct 2024 11:36:56 -0400 Subject: [PATCH] Fix migrations conflict --- ...191_inventoryitem_status.py => 0192_inventoryitem_status.py} | 2 +- .../{0192_poweroutlet_color.py => 0193_poweroutlet_color.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename netbox/dcim/migrations/{0191_inventoryitem_status.py => 0192_inventoryitem_status.py} (88%) rename netbox/dcim/migrations/{0192_poweroutlet_color.py => 0193_poweroutlet_color.py} (88%) diff --git a/netbox/dcim/migrations/0191_inventoryitem_status.py b/netbox/dcim/migrations/0192_inventoryitem_status.py similarity index 88% rename from netbox/dcim/migrations/0191_inventoryitem_status.py rename to netbox/dcim/migrations/0192_inventoryitem_status.py index 23daf903d..335ab2ca7 100644 --- a/netbox/dcim/migrations/0191_inventoryitem_status.py +++ b/netbox/dcim/migrations/0192_inventoryitem_status.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0190_nested_modules'), + ('dcim', '0191_module_bay_rebuild'), ] operations = [ diff --git a/netbox/dcim/migrations/0192_poweroutlet_color.py b/netbox/dcim/migrations/0193_poweroutlet_color.py similarity index 88% rename from netbox/dcim/migrations/0192_poweroutlet_color.py rename to netbox/dcim/migrations/0193_poweroutlet_color.py index 4fb5f4663..0a6c08b48 100644 --- a/netbox/dcim/migrations/0192_poweroutlet_color.py +++ b/netbox/dcim/migrations/0193_poweroutlet_color.py @@ -7,7 +7,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0191_inventoryitem_status'), + ('dcim', '0192_inventoryitem_status'), ] operations = [