From 1095589ca30381c17cc8791363bb8f3ad11c43fb Mon Sep 17 00:00:00 2001 From: Sawyer Bergeron Date: Wed, 15 Dec 2021 16:45:18 -0500 Subject: [PATCH] Reorder conflicting leaf migrations Signed-off-by: Sawyer Bergeron Change-Id: I0c06f6f6ceccc17431d319577b72dfe75bea7cff Signed-off-by: Sawyer Bergeron --- src/api/migrations/0022_merge_20211102_2136.py | 14 ++++++++++++++ ...nerated_field.py => 0023_add_cifile_generated_field.py} | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/api/migrations/0022_merge_20211102_2136.py rename src/api/migrations/{0022_add_cifile_generated_field.py => 0023_add_cifile_generated_field.py} (86%) 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 = [ -- 2.16.6