From 2a4a14431e3397db5ecfb0ba64a4873a9d890025 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Jul 2025 12:40:19 -0400 Subject: [PATCH] Resolve migrations conflict --- ...{0017_concrete_objecttype.py => 0018_concrete_objecttype.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename netbox/core/migrations/{0017_concrete_objecttype.py => 0018_concrete_objecttype.py} (97%) diff --git a/netbox/core/migrations/0017_concrete_objecttype.py b/netbox/core/migrations/0018_concrete_objecttype.py similarity index 97% rename from netbox/core/migrations/0017_concrete_objecttype.py rename to netbox/core/migrations/0018_concrete_objecttype.py index 899a1d2e8..4e227fe7a 100644 --- a/netbox/core/migrations/0017_concrete_objecttype.py +++ b/netbox/core/migrations/0018_concrete_objecttype.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('core', '0016_job_log_entries'), + ('core', '0017_objectchange_message'), ] operations = [