From 3d2cf792220f2c5f1fcccb27febe125b27d79105 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 4 Aug 2025 09:32:08 -0400 Subject: [PATCH] Resolve migration conflict --- ...{0209_macaddress_ordering.py => 0210_macaddress_ordering.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename netbox/dcim/migrations/{0209_macaddress_ordering.py => 0210_macaddress_ordering.py} (86%) diff --git a/netbox/dcim/migrations/0209_macaddress_ordering.py b/netbox/dcim/migrations/0210_macaddress_ordering.py similarity index 86% rename from netbox/dcim/migrations/0209_macaddress_ordering.py rename to netbox/dcim/migrations/0210_macaddress_ordering.py index 2f3b6de06..5d719c5ad 100644 --- a/netbox/dcim/migrations/0209_macaddress_ordering.py +++ b/netbox/dcim/migrations/0210_macaddress_ordering.py @@ -4,7 +4,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0208_devicerole_uniqueness'), + ('dcim', '0209_device_component_denorm_site_location'), ] operations = [