Update & merge migrations

netbox/dcim/migrations/0169_device_configtemplate.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.1.6 on 2023-02-10 14:32
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('extras', '0086_configtemplate'),
-        ('dcim', '0168_interface_template_enabled'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='device',
-            name='config_template',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='extras.configtemplate'),
-        ),
-    ]

netbox/dcim/migrations/0170_configtemplate.py

@@ -1,5 +1,3 @@
-# Generated by Django 4.1.6 on 2023-02-12 20:41
-
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -8,10 +6,15 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('extras', '0086_configtemplate'),
-        ('dcim', '0169_device_configtemplate'),
+        ('dcim', '0169_devicetype_default_platform'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='device',
+            name='config_template',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='extras.configtemplate'),
+        ),
         migrations.AddField(
             model_name='devicerole',
             name='config_template',