From 96462e9521ac9a3acc38e104a60b4dc181259215 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 28 Mar 2025 16:21:56 -0400 Subject: [PATCH] Fix migrations conflict --- .../{0204_moduletypeprofile.py => 0205_moduletypeprofile.py} | 2 +- ...odule_type_profiles.py => 0206_load_module_type_profiles.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename netbox/dcim/migrations/{0204_moduletypeprofile.py => 0205_moduletypeprofile.py} (97%) rename netbox/dcim/migrations/{0205_load_module_type_profiles.py => 0206_load_module_type_profiles.py} (95%) diff --git a/netbox/dcim/migrations/0204_moduletypeprofile.py b/netbox/dcim/migrations/0205_moduletypeprofile.py similarity index 97% rename from netbox/dcim/migrations/0204_moduletypeprofile.py rename to netbox/dcim/migrations/0205_moduletypeprofile.py index 6f3348679..3e9a4d6d8 100644 --- a/netbox/dcim/migrations/0204_moduletypeprofile.py +++ b/netbox/dcim/migrations/0205_moduletypeprofile.py @@ -7,7 +7,7 @@ import utilities.json class Migration(migrations.Migration): dependencies = [ - ('dcim', '0203_add_rack_outer_height'), + ('dcim', '0204_device_role_rebuild'), ('extras', '0125_exporttemplate_file_name'), ] diff --git a/netbox/dcim/migrations/0205_load_module_type_profiles.py b/netbox/dcim/migrations/0206_load_module_type_profiles.py similarity index 95% rename from netbox/dcim/migrations/0205_load_module_type_profiles.py rename to netbox/dcim/migrations/0206_load_module_type_profiles.py index 7188c5d13..e3ca7d27a 100644 --- a/netbox/dcim/migrations/0205_load_module_type_profiles.py +++ b/netbox/dcim/migrations/0206_load_module_type_profiles.py @@ -34,7 +34,7 @@ def load_initial_data(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('dcim', '0204_moduletypeprofile'), + ('dcim', '0205_moduletypeprofile'), ] operations = [