From 844fb1f7ecc0a963b09e4b4825cc00cd704f5332 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 26 Jul 2024 15:26:29 +0700 Subject: [PATCH] 10500 fix conflicting migration from merge --- ...9_modulebay_module_modulebaytemplate_module_type_and_more.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py b/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py index 9958eebd1..3aa83f9db 100644 --- a/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py +++ b/netbox/dcim/migrations/0189_modulebay_module_modulebaytemplate_module_type_and_more.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0188_racktype'), + ('dcim', '0189_moduletype_airflow_rack_airflow_racktype_airflow'), ] operations = [