From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Wed, 15 Dec 2021 21:45:18 +0000 (-0500)
Subject: Reorder conflicting leaf migrations
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F73112%2F2;p=laas.git

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>
---

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/0022_add_cifile_generated_field.py b/src/api/migrations/0023_add_cifile_generated_field.py
similarity index 86%
rename from src/api/migrations/0022_add_cifile_generated_field.py
rename to src/api/migrations/0023_add_cifile_generated_field.py
index 28d5172..df2b6d7 100644
--- a/src/api/migrations/0022_add_cifile_generated_field.py
+++ b/src/api/migrations/0023_add_cifile_generated_field.py
@@ -2,7 +2,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('api', '0018_cloudinitfile'),
+        ('api', '0022_merge_20211102_2136'),
     ]
 
     operations = [