From 1095589ca30381c17cc8791363bb8f3ad11c43fb Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Wed, 15 Dec 2021 16:45:18 -0500
Subject: Reorder conflicting leaf migrations

Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I0c06f6f6ceccc17431d319577b72dfe75bea7cff
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
---
 src/api/migrations/0022_add_cifile_generated_field.py | 14 --------------
 src/api/migrations/0022_merge_20211102_2136.py        | 14 ++++++++++++++
 src/api/migrations/0023_add_cifile_generated_field.py | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 14 deletions(-)
 delete mode 100644 src/api/migrations/0022_add_cifile_generated_field.py
 create mode 100644 src/api/migrations/0022_merge_20211102_2136.py
 create mode 100644 src/api/migrations/0023_add_cifile_generated_field.py

(limited to 'src')

diff --git a/src/api/migrations/0022_add_cifile_generated_field.py b/src/api/migrations/0022_add_cifile_generated_field.py
deleted file mode 100644
index 28d5172..0000000
--- a/src/api/migrations/0022_add_cifile_generated_field.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.db import migrations, models
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('api', '0018_cloudinitfile'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="CloudInitFile",
-            name="generated",
-            field=models.BooleanField(default=False)
-        ),
-    ]
diff --git a/src/api/migrations/0022_merge_20211102_2136.py b/src/api/migrations/0022_merge_20211102_2136.py
new file mode 100644
index 0000000..bb27ae4
--- /dev/null
+++ b/src/api/migrations/0022_merge_20211102_2136.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2 on 2021-11-02 21:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0019_auto_20210907_1448'),
+        ('api', '0021_auto_20210405_1943'),
+    ]
+
+    operations = [
+    ]
diff --git a/src/api/migrations/0023_add_cifile_generated_field.py b/src/api/migrations/0023_add_cifile_generated_field.py
new file mode 100644
index 0000000..df2b6d7
--- /dev/null
+++ b/src/api/migrations/0023_add_cifile_generated_field.py
@@ -0,0 +1,14 @@
+from django.db import migrations, models
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('api', '0022_merge_20211102_2136'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="CloudInitFile",
+            name="generated",
+            field=models.BooleanField(default=False)
+        ),
+    ]
-- 
cgit 1.2.3-korg