Resolve migrations conflict

netbox/extras/migrations/0079_change_jobresult_order.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.1.1 on 2022-10-09 18:37
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('extras', '0078_unique_constraints'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='jobresult',
-            options={'ordering': ['-created']},
-        ),
-    ]

netbox/extras/migrations/0079_jobresult_scheduled_time.py

@@ -1,12 +1,10 @@
-# Generated by Django 4.1.1 on 2022-10-16 09:52
-
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('extras', '0079_change_jobresult_order'),
+        ('extras', '0078_unique_constraints'),
     ]
 
     operations = [
@@ -15,4 +13,8 @@ class Migration(migrations.Migration):
             name='scheduled_time',
             field=models.DateTimeField(blank=True, null=True),
         ),
+        migrations.AlterModelOptions(
+            name='jobresult',
+            options={'ordering': ['-created']},
+        ),
     ]

netbox/extras/migrations/0080_search.py

@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
-        ('extras', '0078_unique_constraints'),
+        ('extras', '0079_jobresult_scheduled_time'),
     ]
 
     operations = [