diff options
author | 2021-12-15 21:47:04 +0000 | |
---|---|---|
committer | 2021-12-15 21:47:04 +0000 | |
commit | 310b10d38b2f2a7cfe074a5b6b295fdda083a34a (patch) | |
tree | 3060c8da4b222535168649fb2c04b788d0ce8784 /src/api | |
parent | d6eca1e3ce61e0f9ccd154f715cd1b1a2f5fd9fb (diff) | |
parent | 1095589ca30381c17cc8791363bb8f3ad11c43fb (diff) |
Merge "Reorder conflicting leaf migrations"
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/migrations/0022_merge_20211102_2136.py | 14 | ||||
-rw-r--r-- | src/api/migrations/0023_add_cifile_generated_field.py (renamed from src/api/migrations/0022_add_cifile_generated_field.py) | 2 |
2 files changed, 15 insertions, 1 deletions
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 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 = [ |