From e3d5282269102d0a35a5d2d147e7481ebe78020a Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 21 Oct 2022 12:22:30 -0400
Subject: [PATCH] Resolve migrations conflict

---
 .../migrations/0079_change_jobresult_order.py   | 17 -----------------
 ...time.py => 0079_jobresult_scheduled_time.py} |  8 +++++---
 .../{0079_search.py => 0080_search.py}          |  2 +-
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 netbox/extras/migrations/0079_change_jobresult_order.py
 rename netbox/extras/migrations/{0080_add_jobresult_scheduled_time.py => 0079_jobresult_scheduled_time.py} (64%)
 rename netbox/extras/migrations/{0079_search.py => 0080_search.py} (96%)

diff --git a/netbox/extras/migrations/0079_change_jobresult_order.py b/netbox/extras/migrations/0079_change_jobresult_order.py
deleted file mode 100644
index 12e35bf67..000000000
--- a/netbox/extras/migrations/0079_change_jobresult_order.py
+++ /dev/null
@@ -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']},
-        ),
-    ]
diff --git a/netbox/extras/migrations/0080_add_jobresult_scheduled_time.py b/netbox/extras/migrations/0079_jobresult_scheduled_time.py
similarity index 64%
rename from netbox/extras/migrations/0080_add_jobresult_scheduled_time.py
rename to netbox/extras/migrations/0079_jobresult_scheduled_time.py
index fddde4bc5..c9646f13c 100644
--- a/netbox/extras/migrations/0080_add_jobresult_scheduled_time.py
+++ b/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']},
+        ),
     ]
diff --git a/netbox/extras/migrations/0079_search.py b/netbox/extras/migrations/0080_search.py
similarity index 96%
rename from netbox/extras/migrations/0079_search.py
rename to netbox/extras/migrations/0080_search.py
index 186e9ffb1..7a133e84b 100644
--- a/netbox/extras/migrations/0079_search.py
+++ b/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 = [