From af0b2b777ecda92180c13bfc3099902eb8e4fa35 Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Wed, 25 Feb 2026 13:24:31 +0100
Subject: [PATCH] Rebase against origin/master

---
 ...reusablemedium_label.py => 0298_add_reusablemedium_label.py} | 2 +-
 ...rposition.py => 0299_reusablemedium_remove_orderposition.py} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/pretix/base/migrations/{0297_add_reusablemedium_label.py => 0298_add_reusablemedium_label.py} (95%)
 rename src/pretix/base/migrations/{0298_reusablemedium_remove_orderposition.py => 0299_reusablemedium_remove_orderposition.py} (96%)

diff --git a/src/pretix/base/migrations/0297_add_reusablemedium_label.py b/src/pretix/base/migrations/0298_add_reusablemedium_label.py
similarity index 95%
rename from src/pretix/base/migrations/0297_add_reusablemedium_label.py
rename to src/pretix/base/migrations/0298_add_reusablemedium_label.py
index 2beb7c607e..060e0116cf 100644
--- a/src/pretix/base/migrations/0297_add_reusablemedium_label.py
+++ b/src/pretix/base/migrations/0298_add_reusablemedium_label.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("pretixbase", "0296_invoice_invoice_from_state"),
+        ("pretixbase", "0297_outgoingmail"),
     ]
 
     operations = [
diff --git a/src/pretix/base/migrations/0298_reusablemedium_remove_orderposition.py b/src/pretix/base/migrations/0299_reusablemedium_remove_orderposition.py
similarity index 96%
rename from src/pretix/base/migrations/0298_reusablemedium_remove_orderposition.py
rename to src/pretix/base/migrations/0299_reusablemedium_remove_orderposition.py
index c4f1ae8157..2ab561ff8a 100644
--- a/src/pretix/base/migrations/0298_reusablemedium_remove_orderposition.py
+++ b/src/pretix/base/migrations/0299_reusablemedium_remove_orderposition.py
@@ -22,7 +22,7 @@ def reverse(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("pretixbase", "0297_add_reusablemedium_label"),
+        ("pretixbase", "0298_add_reusablemedium_label"),
     ]
 
     operations = [