From 41ef66917d353f100ad166a65eaa410e4cef487b Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 22 Dec 2020 11:31:14 +0100
Subject: [PATCH] Properly backport migrations

---
 ...0201218_1810.py => 0162b_auto_20201218_1810.py} |  6 +-----
 .../base/migrations/0171_merge_20201222_1030.py    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)
 rename src/pretix/base/migrations/{0170b_auto_20201218_1810.py => 0162b_auto_20201218_1810.py} (73%)
 create mode 100644 src/pretix/base/migrations/0171_merge_20201222_1030.py

diff --git a/src/pretix/base/migrations/0170b_auto_20201218_1810.py b/src/pretix/base/migrations/0162b_auto_20201218_1810.py
similarity index 73%
rename from src/pretix/base/migrations/0170b_auto_20201218_1810.py
rename to src/pretix/base/migrations/0162b_auto_20201218_1810.py
index 2a5a2f2f3..399a4ec5f 100644
--- a/src/pretix/base/migrations/0170b_auto_20201218_1810.py
+++ b/src/pretix/base/migrations/0162b_auto_20201218_1810.py
@@ -6,11 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('pretixbase', '0170_remove_hidden_urls'),
-    ]
-    replaces = [
-        ('pretixbase', '0162b_auto_20201218_1810'),
-        ('pretixbase', '0169b_auto_20201218_1810'),
+        ('pretixbase', '0162_remove_seat_name'),
     ]
 
     operations = [
diff --git a/src/pretix/base/migrations/0171_merge_20201222_1030.py b/src/pretix/base/migrations/0171_merge_20201222_1030.py
new file mode 100644
index 000000000..3f2ee4d63
--- /dev/null
+++ b/src/pretix/base/migrations/0171_merge_20201222_1030.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.11 on 2020-12-22 10:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0170_remove_hidden_urls'),
+        ('pretixbase', '0162b_auto_20201218_1810'),
+    ]
+
+    operations = [
+    ]