From 508538aa76bd7dc2847a669afd7e8a55556709a4 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 22 Dec 2020 11:29:34 +0100
Subject: [PATCH] Correct backporting of migrations

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

diff --git a/src/pretix/base/migrations/0169b_auto_20201218_1810.py b/src/pretix/base/migrations/0162b_auto_20201218_1810.py
similarity index 80%
rename from src/pretix/base/migrations/0169b_auto_20201218_1810.py
rename to src/pretix/base/migrations/0162b_auto_20201218_1810.py
index 9674d9cceb..399a4ec5f3 100644
--- a/src/pretix/base/migrations/0169b_auto_20201218_1810.py
+++ b/src/pretix/base/migrations/0162b_auto_20201218_1810.py
@@ -6,10 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('pretixbase', '0169_checkinlist_gates'),
-    ]
-    replaces = [
-        ('pretixbase', '0162b_auto_20201218_1810'),
+        ('pretixbase', '0162_remove_seat_name'),
     ]
 
     operations = [
diff --git a/src/pretix/base/migrations/0170_merge_20201222_1028.py b/src/pretix/base/migrations/0170_merge_20201222_1028.py
new file mode 100644
index 0000000000..f8b4b41679
--- /dev/null
+++ b/src/pretix/base/migrations/0170_merge_20201222_1028.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.11 on 2020-12-22 10:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0169_checkinlist_gates'),
+        ('pretixbase', '0162b_auto_20201218_1810'),
+    ]
+
+    operations = [
+    ]