From 76bf80a7eedb3b60ecaae8400995f27c07f5f22e Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Wed, 19 Mar 2025 12:55:06 -0500 Subject: [PATCH] Fixes migration conflict caused by fix for #17841 --- netbox/extras/migrations/0124_alter_tag_options_tag_weight.py | 2 -- ...rttemplate_file_name.py => 0125_exporttemplate_file_name.py} | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename netbox/extras/migrations/{0124_exporttemplate_file_name.py => 0125_exporttemplate_file_name.py} (84%) diff --git a/netbox/extras/migrations/0124_alter_tag_options_tag_weight.py b/netbox/extras/migrations/0124_alter_tag_options_tag_weight.py index 86fc71fd5..759ad1595 100644 --- a/netbox/extras/migrations/0124_alter_tag_options_tag_weight.py +++ b/netbox/extras/migrations/0124_alter_tag_options_tag_weight.py @@ -1,5 +1,3 @@ -# Generated by Django 5.2b1 on 2025-03-17 14:41 - from django.db import migrations, models diff --git a/netbox/extras/migrations/0124_exporttemplate_file_name.py b/netbox/extras/migrations/0125_exporttemplate_file_name.py similarity index 84% rename from netbox/extras/migrations/0124_exporttemplate_file_name.py rename to netbox/extras/migrations/0125_exporttemplate_file_name.py index f4c1f3986..2c8ac118b 100644 --- a/netbox/extras/migrations/0124_exporttemplate_file_name.py +++ b/netbox/extras/migrations/0125_exporttemplate_file_name.py @@ -4,7 +4,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('extras', '0123_remove_staging'), + ('extras', '0124_alter_tag_options_tag_weight'), ] operations = [