From 71488f0a0218ea271effc3904695c0b2c4e1f5b1 Mon Sep 17 00:00:00 2001 From: luelista Date: Thu, 16 Jul 2026 17:07:25 +0200 Subject: [PATCH] Fix migration conflict (#6388) --- ...eventmetaproperties.py => 0305_fixup_eventmetaproperties.py} | 2 +- ...ether.py => 0306_alter_eventmetaproperty_unique_together.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/pretix/base/migrations/{0302_fixup_eventmetaproperties.py => 0305_fixup_eventmetaproperties.py} (98%) rename src/pretix/base/migrations/{0303_alter_eventmetaproperty_unique_together.py => 0306_alter_eventmetaproperty_unique_together.py} (84%) diff --git a/src/pretix/base/migrations/0302_fixup_eventmetaproperties.py b/src/pretix/base/migrations/0305_fixup_eventmetaproperties.py similarity index 98% rename from src/pretix/base/migrations/0302_fixup_eventmetaproperties.py rename to src/pretix/base/migrations/0305_fixup_eventmetaproperties.py index 89672216e..93525c24d 100644 --- a/src/pretix/base/migrations/0302_fixup_eventmetaproperties.py +++ b/src/pretix/base/migrations/0305_fixup_eventmetaproperties.py @@ -82,7 +82,7 @@ def make_eventmetaproperties_unique(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("pretixbase", "0301_reusablemedium_remove_orderposition"), + ("pretixbase", "0304_tax_rate_decimals"), ] operations = [ diff --git a/src/pretix/base/migrations/0303_alter_eventmetaproperty_unique_together.py b/src/pretix/base/migrations/0306_alter_eventmetaproperty_unique_together.py similarity index 84% rename from src/pretix/base/migrations/0303_alter_eventmetaproperty_unique_together.py rename to src/pretix/base/migrations/0306_alter_eventmetaproperty_unique_together.py index a16012c2a..dbd64f394 100644 --- a/src/pretix/base/migrations/0303_alter_eventmetaproperty_unique_together.py +++ b/src/pretix/base/migrations/0306_alter_eventmetaproperty_unique_together.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ("pretixbase", "0302_fixup_eventmetaproperties"), + ("pretixbase", "0305_fixup_eventmetaproperties"), ] operations = [