From d207514c9a885faff5a9e6807fcd08512b0a0d88 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 22 Dec 2020 11:20:24 +0100 Subject: [PATCH] Change migration graph to be compatible with backports --- ...0201218_1810.py => 0162b_auto_20201218_1810.py} | 2 +- .../base/migrations/0174_merge_20201222_1031.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) rename src/pretix/base/migrations/{0174_auto_20201218_1810.py => 0162b_auto_20201218_1810.py} (90%) create mode 100644 src/pretix/base/migrations/0174_merge_20201222_1031.py diff --git a/src/pretix/base/migrations/0174_auto_20201218_1810.py b/src/pretix/base/migrations/0162b_auto_20201218_1810.py similarity index 90% rename from src/pretix/base/migrations/0174_auto_20201218_1810.py rename to src/pretix/base/migrations/0162b_auto_20201218_1810.py index ec7e82502..399a4ec5f 100644 --- a/src/pretix/base/migrations/0174_auto_20201218_1810.py +++ b/src/pretix/base/migrations/0162b_auto_20201218_1810.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('pretixbase', '0173_auto_20201211_1648'), + ('pretixbase', '0162_remove_seat_name'), ] operations = [ diff --git a/src/pretix/base/migrations/0174_merge_20201222_1031.py b/src/pretix/base/migrations/0174_merge_20201222_1031.py new file mode 100644 index 000000000..f4c5cdeff --- /dev/null +++ b/src/pretix/base/migrations/0174_merge_20201222_1031.py @@ -0,0 +1,14 @@ +# Generated by Django 3.0.11 on 2020-12-22 10:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0173_auto_20201211_1648'), + ('pretixbase', '0162b_auto_20201218_1810'), + ] + + operations = [ + ]