From c209bebaee9f3324ef372b0dee30f30b21782e29 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 29 Sep 2022 10:48:47 -0400 Subject: [PATCH] Resolve migrations conflict --- ...t_and_more.py => 0163_rack_devicetype_moduletype_weights.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename netbox/dcim/migrations/{0162_devicetype__abs_weight_devicetype_weight_and_more.py => 0163_rack_devicetype_moduletype_weights.py} (97%) diff --git a/netbox/dcim/migrations/0162_devicetype__abs_weight_devicetype_weight_and_more.py b/netbox/dcim/migrations/0163_rack_devicetype_moduletype_weights.py similarity index 97% rename from netbox/dcim/migrations/0162_devicetype__abs_weight_devicetype_weight_and_more.py rename to netbox/dcim/migrations/0163_rack_devicetype_moduletype_weights.py index 3c3421ba5..09bef5736 100644 --- a/netbox/dcim/migrations/0162_devicetype__abs_weight_devicetype_weight_and_more.py +++ b/netbox/dcim/migrations/0163_rack_devicetype_moduletype_weights.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0161_cabling_cleanup'), + ('dcim', '0162_unique_constraints'), ] operations = [