From b267cbae36edc2a975504f58a2fce74bc1372575 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Thu, 9 Feb 2023 08:53:21 -0500
Subject: [PATCH] Merge migrations

---
 ...ext_synced_data.py => 0085_synced_data.py} | 24 +++++++++++--
 .../0086_exporttemplate_synced_data.py        | 35 -------------------
 2 files changed, 22 insertions(+), 37 deletions(-)
 rename netbox/extras/migrations/{0085_configcontext_synced_data.py => 0085_synced_data.py} (54%)
 delete mode 100644 netbox/extras/migrations/0086_exporttemplate_synced_data.py

diff --git a/netbox/extras/migrations/0085_configcontext_synced_data.py b/netbox/extras/migrations/0085_synced_data.py
similarity index 54%
rename from netbox/extras/migrations/0085_configcontext_synced_data.py
rename to netbox/extras/migrations/0085_synced_data.py
index f3022665b..4790cd51a 100644
--- a/netbox/extras/migrations/0085_configcontext_synced_data.py
+++ b/netbox/extras/migrations/0085_synced_data.py
@@ -1,5 +1,3 @@
-# Generated by Django 4.1.6 on 2023-02-06 15:34
-
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -12,6 +10,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        # ConfigContexts
         migrations.AddField(
             model_name='configcontext',
             name='data_file',
@@ -32,4 +31,25 @@ class Migration(migrations.Migration):
             name='data_synced',
             field=models.DateTimeField(blank=True, editable=False, null=True),
         ),
+        # ExportTemplates
+        migrations.AddField(
+            model_name='exporttemplate',
+            name='data_file',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile'),
+        ),
+        migrations.AddField(
+            model_name='exporttemplate',
+            name='data_path',
+            field=models.CharField(blank=True, editable=False, max_length=1000),
+        ),
+        migrations.AddField(
+            model_name='exporttemplate',
+            name='data_source',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource'),
+        ),
+        migrations.AddField(
+            model_name='exporttemplate',
+            name='data_synced',
+            field=models.DateTimeField(blank=True, editable=False, null=True),
+        ),
     ]
diff --git a/netbox/extras/migrations/0086_exporttemplate_synced_data.py b/netbox/extras/migrations/0086_exporttemplate_synced_data.py
deleted file mode 100644
index 87de6b71c..000000000
--- a/netbox/extras/migrations/0086_exporttemplate_synced_data.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by Django 4.1.6 on 2023-02-08 22:16
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0001_initial'),
-        ('extras', '0085_configcontext_synced_data'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='exporttemplate',
-            name='data_file',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile'),
-        ),
-        migrations.AddField(
-            model_name='exporttemplate',
-            name='data_path',
-            field=models.CharField(blank=True, editable=False, max_length=1000),
-        ),
-        migrations.AddField(
-            model_name='exporttemplate',
-            name='data_source',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource'),
-        ),
-        migrations.AddField(
-            model_name='exporttemplate',
-            name='data_synced',
-            field=models.DateTimeField(blank=True, editable=False, null=True),
-        ),
-    ]